Working with map display
Merge branch 'master' of https://github.com/SARmap/SARmap

Conflicts:
	www/map.html
Merge branch 'master' of https://github.com/SARmap/SARmap