合并

增加标准颜色
Merge branch 'master' of https://github.com/tianqu/4Sshop

Conflicts:

ProjectFor4SShop/ProjectFor4SShop.xcodeproj/project.xcworkspace/xcuserda
ta/lanou3g.xcuserdatad/UserInterfaceState.xcuserstate