Cleaning up code. + Better typing. I think?
Merge remote-tracking branch 'origin/master'

Conflicts:
	Quick/Quick/Room.aspx
	Quick/Quick/Room.aspx.designer.cs