Added prompt to select a room before server connection
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
Broke everything, hopefully fixed it, can't be doing with this right now
Fixed sizing to match tall building
Added classes for buildings, made position of space station configurable, include random building on moon
Oculus-Bridge burned the fuck down. Now using vr.js
Removed all references now completely useless to oculus angle compensation variables. Burn in hell Oculus Bridge!
Merge branch 'dev' of https://github.com/satellite-game/Satellite into dev
Merging files that i guess didnt get merged
Merge branch 'dev' of https://github.com/satellite-game/Satellite into oculus-bridge-is-stupid-and-broken

Conflicts:
	build/client/game/s.js
	client/game/classes/s.SatelliteGame.js
Pushing to dev
Merge pull request #206 from ehannum/oculus-bridge-is-stupid-and-broken

Oculus bridge is stupid and broken. Now using vr.js for Oculus Input
Merge branch 'dev' of https://github.com/satellite-game/Satellite into dev

Conflicts:
	client/game/classes/s.SatelliteGame.js
	client/game/classes/s.SpaceStation.js
	include.conf.js
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