Email and Download Changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	Quick/Quick/Room.aspx
	Quick/Quick/Room.aspx.designer.cs
	Quick/Quick/text.txt
	Quick/QuickText.v12.suo