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.csproj.FileListAbsolute.txt

	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.cache

NNNN
Some files added
changes