2
Merge branch 'master' of https://github.com/ezcsy59/taobaoDemo

Conflicts:

taobaoDemo.xcodeproj/project.xcworkspace/xcuserdata/mac.xcuserdatad/User
InterfaceState.xcuserstate