iphone6适配
Merge branch 'master' of https://github.com/yilongchun/hmjz

Conflicts:

hmjz.xcodeproj/project.xcworkspace/xcuserdata/yons.xcuserdatad/UserInter
faceState.xcuserstate