test2
..
Merge branch 'test1'

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