Room changes and stuff.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Quick/QuickText.v12.suo