Chang
Merge remote-tracking branch 'origin/master'

Conflicts:
	CRM_Project/CRM_BAL/bin/Debug/CRM_BAL.dll
	CRM_Project/CRM_BAL/bin/Debug/CRM_BAL.pdb
	CRM_Project/CRM_BAL/obj/Debug/CRM_BAL.dll
	CRM_Project/CRM_BAL/obj/Debug/CRM_BAL.pdb
	CRM_Project/CRM_DAL/bin/Debug/CRM_BAL.dll
	CRM_Project/CRM_DAL/bin/Debug/CRM_BAL.pdb
	CRM_Project/CRM_DAL/bin/Debug/CRM_DAL.dll
	CRM_Project/CRM_DAL/bin/Debug/CRM_DAL.pdb

	CRM_Project/CRM_DAL/obj/Debug/CRM_DAL.csprojResolveAssemblyReference.cache
	CRM_Project/CRM_DAL/obj/Debug/CRM_DAL.dll
	CRM_Project/CRM_DAL/obj/Debug/CRM_DAL.pdb
	CRM_Project/CRM_Project.v12.suo
	CRM_Project/CRM_User_Interface/bin/Debug/CRM_BAL.dll
	CRM_Project/CRM_User_Interface/bin/Debug/CRM_BAL.pdb
	CRM_Project/CRM_User_Interface/bin/Debug/CRM_DAL.dll
	CRM_Project/CRM_User_Interface/bin/Debug/CRM_DAL.pdb
	CRM_Project/CRM_User_Interface/bin/Debug/CRM_User_Interface.exe
	CRM_Project/CRM_User_Interface/bin/Debug/CRM_User_Interface.pdb

	CRM_Project/CRM_User_Interface/obj/Debug/CRM_User_Interface.csprojResolveAssemblyReference.cache
	CRM_Project/CRM_User_Interface/obj/Debug/CRM_User_Interface.exe
	CRM_Project/CRM_User_Interface/obj/Debug/CRM_User_Interface.pdb