new update
Merge remote-tracking branch 'origin/master'

Conflicts:
	CRM_Project/CRM_Project.v12.suo