Bringing in Changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	Quick/Quick/Room.aspx
	Quick/Quick/bin/Quick.dll
	Quick/Quick/bin/Quick.pdb