test
Merge remote-tracking branch 'origin/master'

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