aaa
Merge remote-tracking branch 'origin/master'

Conflicts:
	Blogiclayer/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Daccesslayer/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	InfrastructureManagemnet.v11.suo

	PresentationLayer/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache