organize hotspots

organize hotspots via named categories,
minor fixes
organized hotspots
Merge branch 'temp'

Conflicts:
	public/simple-panorama.js