charlotte
Merge branch 'master' of https://github.com/Harpaga/harpagaproject

Conflicts:
	web/harpaga/frontend/css/frontend-style.css
modif bug
Merge branch 'master' of https://github.com/Harpaga/harpagaproject