derocqqqq
jkjkMerge branch 'master' of https://github.com/hamnn/QuizzFacebook

Conflicts:
	src/Metinet/Bundle/FacebookBundle/Controller/ClassementController.php
Merge branch 'master' of https://github.com/hamnn/QuizzFacebook
azazaz
Merge branch 'master' of https://github.com/hamnn/QuizzFacebook
Merge branch 'master' of https://github.com/hamnn/QuizzFacebook
gh
azMerge branch 'master' of https://github.com/hamnn/QuizzFacebook

Conflicts:
	src/Metinet/Bundle/FacebookBundle/Resources/views/Default/index.html.twig
Merge branch 'master' of https://github.com/hamnn/QuizzFacebook
deor
xccxvMerge branch 'master' of https://github.com/hamnn/QuizzFacebook

Conflicts:
	src/Metinet/Bundle/FacebookBundle/Controller/ClassementController.php
	src/Metinet/Bundle/FacebookBundle/Resources/views/Classement/index.html.twig
	src/Metinet/Bundle/FacebookBundle/Resources/views/Default/index.html.twig
	src/Metinet/Bundle/FacebookBundle/Resources/views/Quizz/details.html.twig
Merge branch 'master' of https://github.com/hamnn/QuizzFacebook