temp
Merge branch 'master' of https://github.com/edwardair/newProject

Conflicts:
	WUXIAPP__
2/wuxigovapp.xcodeproj/project.xcworkspace/xcuserdata/administrater.xcus
erdatad/UserInterfaceState.xcuserstate