Problem with the map : merge
Merge branch 'master' of https://github.com/PaulLabat/SmartCitizen
Correction of merge (modification was done on Paul's computer
Conflicts:
	website/map.html