various updates
Merge remote-tracking branch 'origin/master'

Conflicts:
	SCF.suo
	SCF/bin/Coop.dll
	SCF/bin/Coop.pdb
	SCF/obj/Debug/Coop.dll
	SCF/obj/Debug/Coop.pdb
	SCF/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Merge remote-tracking branch 'origin/master'

Conflicts:
	SCF.suo
	SCF/bin/Coop.dll
	SCF/bin/Coop.pdb
	SCF/obj/Debug/Coop.dll
	SCF/obj/Debug/Coop.pdb
	SCF/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache