Creation du bundle User
Suppression du bundle Merchant
Modification de la structure
Merge branch 'master' of https://github.com/Harpaga/harpagaproject.git

Conflicts:
	src/Harpaga/FrontendBundle/Resources/views/Promotion/index.html.twig