BUG
2
Merge branch 'master' of https://github.com/coojee2012/jzycrm

Conflicts:
	wcfinterface/SMSWcfService/SMSWcfService.suo