nothong
Merge branch 'client' into develop

Conflicts:
	XinYuanERP/Main/MainViewController.m