1
Merge remote-tracking branch 'origin/master'

Conflicts:
	AcePortal/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache