barre recherche
Merge branch 'master' of https://github.com/nicolasBeze/harpagamobile

Conflicts:
	www/index.html
Merge branch 'master' of https://github.com/nicolasBeze/harpagamobile

Conflicts:
	www/partials/commerce.html
charlotte
charlotte
Merge branch 'master' of https://github.com/nicolasBeze/harpagamobile