miniature
Merge branch 'master' of https://github.com/lleugami/ptutfb

Conflicts:
	src/Metinet/Bundle/FacebookBundle/Entity/Quizz.php
	src/Metinet/Bundle/FacebookBundle/Resources/views/Quizz/index.html.twig