Merge branch 'master' of https://github.com/geass88/symfony.git

Conflicts:
	src/Tommaso/FooBundle/Resources/views/Default/index.html.twig