Merge remote-tracking branch 'origin/master'

Conflicts:
	CRM_Project/CRM_Project.v12.suo
	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.exe
	CRM_Project/CRM_User_Interface/obj/Debug/CRM_User_Interface.pdb

changes
chj
bbjh
Changes made by Nazzia
chnges
Merge remote-tracking branch 'origin/master'

Conflicts:
	CRM_Project/CRM_BAL/obj/Debug/CRM_BAL.csproj.FileListAbsolute.txt
	CRM_Project/CRM_DAL/obj/Debug/CRM_DAL.csproj.FileListAbsolute.txt

	CRM_Project/CRM_DAL/obj/Debug/CRM_DAL.csprojResolveAssemblyReference.cache
	CRM_Project/CRM_Project.v12.suo
	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.csproj.GenerateResource.Cache

	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

	CRM_Project/CRM_User_Interface/obj/Debug/CRM_User_Interface_MarkupCompile.i.cache
Merge branch 'master' of https://github.com/Byte-Machines/CRM

Conflicts:
	CRM_Project/CRM_Project.v12.suo