Merge branch 'menu' into dev

Conflicts:
	build/client/game/s.js
	client/game/classes/s.SatelliteGame.js
Added dummy ajax requests to get room and player data from database
Merge branch 'dev' of https://github.com/satellite-game/Satellite into dev
Merge branch 'dev' of https://github.com/satellite-game/Satellite into dev
Merging files that i guess didnt get merged
commit build
Bit of design polish, figuring out normal mapping
Merge branch 'dev' of https://github.com/satellite-game/Satellite into dev

Conflicts:
	build/client/game/s.js
	client/game/classes/s.SatelliteGame.js
Merge branch 'new-moon' into dev
Oculus always on bug fixed. closes #208
Oculus detection bug fixed but requres browser restart to update oculus detection state
Merge pull request #209 from ehannum/dev

Oculus 'always on' bug fixed. Closes #208
Merge branch 'dev' of https://github.com/satellite-game/Satellite into dev

Conflicts:
	build/client/game/s.js