Room changes + Update to CodeMirror
Merge remote-tracking branch 'origin/master'

Conflicts:
	Quick/Quick/Room.aspx
	Quick/QuickText.v12.suo