Lots of minor style and bug fixes
Merge branch 'bug_49_globe_rendering' into next

Conflicts:
	web/lib/ui/gis.js
Fix spelling typo
Merge branch 'bug_49_globe_rendering' into next