更改
更改
Merge branch 'master' of https://github.com/wangguofeng-live/MadeInChina

Conflicts:
	MadeInChina.xcodeproj/project.pbxproj

MadeInChina.xcworkspace/xcuserdata/wangguofeng.xcuserdatad/UserInterface
State.xcuserstate
	MadeInChina/en.lproj/InfoPlist.strings