提交
Merge branch 'master' of https://github.com/igiu1988/WYIOSFramework

Conflicts:
	.DS_Store

WYISOFramework.xcodeproj/project.xcworkspace/xcuserdata/wangyang.xcuserd
atad/UserInterfaceState.xcuserstate