derocq
Merge branch 'master' of https://github.com/hamnn/QuizzFacebook
Merge branch 'master' of https://github.com/hamnn/QuizzFacebook
der
derMerge branch 'master' of https://github.com/hamnn/QuizzFacebook

Conflicts:
	src/Metinet/Bundle/FacebookBundle/Controller/PlayController.php
dero
derMerge branch 'master' of https://github.com/hamnn/QuizzFacebook

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