NC

NC
Merge remote-tracking branch 'origin/master'

Conflicts:
	SCF.suo
	SCF/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache