xxx
Merge branch 'develop' into client
http request make from view
remove .gitattributes
Merge branch 'develop' into client
before merge
structure redefine
Merge branch 'develop' into client

Conflicts:
	XinYuanERP.xcodeproj/project.pbxproj
	XinYuanERP/Main/LoginViewController.m
before merge
merge json view
nothing
nothing
Merge branch 'develop' into client
Merge branch 'develop' into client
nothing
Merge branch 'develop' into client
ordersMainViewController,ClientListViewController,UserListViewController, changed
merge with develop