no message
Merge branch 'master' of https://github.com/bugzero/tongxunlu

Conflicts:
	Tongxunlu/Tongxunlu/Classes/Controller/Connect/support/ContractViewController.m