test

test
Merge remote-tracking branch 'origin/master'

Conflicts:

	Testapp/Testapp/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache