dfdklgjdg
Merge branch 'develop' of https://github.com/kevinyby/XinYuanERP into develop

Conflicts:
	XinYuanERP/Main/LoginViewController.m