pas de conflits please
Merge branch 'master' of https://github.com/nicolasBeze/harpagamobile

Conflicts:
	www/partials/commerce.html