base du projet
Merge branch 'master' of https://github.com/badelas/symfony2complet

Conflicts:
	README.md