More Bug Fixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	Quick/Quick/Room.aspx