f
efgojegfsoegjposejgpsejgfMerge branch 'master' of https://github.com/lleugami/ptutfb

Conflicts:
	src/Metinet/Bundle/FacebookBundle/Controller/DefaultController.php
	src/Metinet/Bundle/FacebookBundle/Entity/Repository/UserRepository.php