Unit test adds
Merge remote-tracking branch 'origin/master'

Conflicts:
	Quick/Quick/Room.aspx
	Quick/Quick/obj/Debug/Quick.dll
	Quick/Quick/obj/Debug/Quick.pdb
	Quick/Quick/obj/Debug/QuickText.csprojResolveAssemblyReference.cache
	Quick/QuickText.v12.suo