Angular JS and Room changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	Quick/Quick/bin/Quick.dll
	Quick/Quick/bin/Quick.pdb
	Quick/Quick/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Quick/Quick/obj/Debug/Quick.dll
	Quick/Quick/obj/Debug/Quick.pdb
	Quick/QuickText.v12.suo