k
kkk
rerge branch 'master' of https://github.com/Harpaga/harpagaproject

Conflicts:
	src/Harpaga/FrontendBundle/Controller/DefaultController.php
	src/Harpaga/FrontendBundle/DependencyInjection/Configuration.php
	src/Harpaga/FrontendBundle/DependencyInjection/HarpagaFrontendExtension.php
	src/Harpaga/FrontendBundle/Entity/Commentaire.php
	src/Harpaga/FrontendBundle/Entity/Commerce.php
	src/Harpaga/FrontendBundle/Entity/LiaisonUtilisateurCommerce.php
	src/Harpaga/FrontendBundle/Entity/Promotion.php
	src/Harpaga/FrontendBundle/Entity/Utilisateur.php
	src/Harpaga/FrontendBundle/Resources/translations/messages.fr.xlf
	src/Harpaga/FrontendBundle/Resources/views/Default/index.html.twig
	src/Harpaga/FrontendBundle/Tests/Controller/DefaultControllerTest.php