correction timeout pour la geolocation
test
Merge branch 'master' of https://github.com/motoi75/em_project_mobile
recherche qui dechire
Merge branch 'master' of https://github.com/motoi75/em_project_mobile

Conflicts:
	www/assets/js/mapsubmit.js