Pep Guardiola will return to Camp Nou this season after Manchester City drew Barcelona in the Champions League group stages