Derocq
Merge branch 'master' of https://github.com/hamnn/QuizzFacebook

Conflicts:
	nbproject/private/private.properties
	src/Metinet/Bundle/FacebookBundle/Controller/QuizzController.php
	src/Metinet/Bundle/FacebookBundle/Entity/Quizz.php
	src/Metinet/Bundle/FacebookBundle/Resources/views/Quizz/index.html.twig
derocq
alex
Merge branch 'master' of https://github.com/hamnn/QuizzFacebook

Conflicts:
	src/Metinet/Bundle/FacebookBundle/Controller/AdminController.php