Merged Aza + Raph
Merge branch 'master' of github.com:aza/nightsky

Conflicts:
	js/app.js
made toggle between oculus and mouse work
users -> players