Merge remote-tracking branch 'origin/master'

Conflicts:

	BusinessLayer/BusinessLayer/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	CMAS/CMAS.v11.suo
	CMAS/CMAS/obj/Debug/CMAS.csproj.FileListAbsolute.txt
	CMAS/CMAS/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache

	MapDataMaper/MapDataMaper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache