..
Merge branch 'master' of https://github.com/wuyuedefeng/WSFouncDesign

Conflicts:
	WSFouncDesign.xcodeproj/project.xcworkspace/xcuserdata/wangsen.xcuserdatad/UserInterfaceState.xcuserstate