interface main
Merge remote-tracking branch 'origin/master'

Conflicts:
	CPA/Main/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache