You are know .
Yes .. ok , conflic fixed .Merge branch 'develop' of https://github.com/kevinyby/XinYuanERP into develop

Conflicts:
	XinYuanERP/Main/LoginViewController.m
	XinYuanERP/Resource/JsonViewResource/Models/Finance/FinancePaymentOrder.json
	XinYuanERP/Resource/Localize/Finance/Localize_Finance_Viet_Nam.strings
	XinYuanERP/Resource/Localize/Finance/Localize_Finance_en.strings
	XinYuanERP/Resource/Localize/Finance/Localize_Finance_zh_TW.strings