111

111
Merge branch 'master' of https://github.com/YANGReal/iCareer

Conflicts:

iCareer.xcodeproj/project.xcworkspace/xcuserdata/yangrui.xcuserdatad/Use
rInterfaceState.xcuserstate