a
Merge remote-tracking branch 'origin/master'

Conflicts:

	TCMSProject/TCMSProject/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache

	TCMSProject/TCMSProject/obj/Debug/TCMS.Web.csprojResolveAssemblyReference.cache

	TCMSProject/tcmsDAL/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache

	TCMSProject/tcmsDAL/obj/Debug/TCMS.Dal.csprojResolveAssemblyReference.cache