camera/autorotation adjustments
Merge branch 'master' of github.com:typpo/millenium-viz

Conflicts:
	web/main.js
edit message