Ajout de modifs jamais commitées
Merge branch 'master' of https://github.com/florian987/coasters-world

Conflicts:
	src/CoastersWorld/Bundle/SiteBundle/Controller/NewsController.php