geolocalisation

geolocalisation
sf
Merge branch 'master' of https://github.com/antoinerapy/uniiti

Conflicts:
	css/main.css
	pages/commerce.php
	pages/commerce_interface.php