Changement map google
Merge branch 'master' of https://github.com/Harpaga/harpagaproject

Conflicts:
	src/Harpaga/FrontendBundle/Resources/views/Page/contact.html.twig
maj
modif gitignore
Merge branch 'master' of https://github.com/Harpaga/harpagaproject.git
Système de notation
@
Merge branch 'master' of https://github.com/Harpaga/harpagaproject
promotion default
Merge branch 'master' of https://github.com/Harpaga/harpagaproject
Fancybox login
page promotions
Merge branch 'master' of https://github.com/Harpaga/harpagaproject.git
correction bug ajout commerce
correction du bug event.preventDefault
modif  layout
Système de notation final
Merge branch 'master' of https://github.com/Harpaga/harpagaproject
avancement ajout promotion
Merge branch 'master' of https://github.com/Harpaga/harpagaproject.git
fin partie ajout promotion