Email + Merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	Quick/Quick/Room.aspx
	Quick/Quick/obj/Debug/QuickText.csproj.FileListAbsolute.txt