none
Merge branch 'master' of https://github.com/lhshin/NewZhongYanWithMailCore2

Conflicts:

NewZhongYan/NewZhongYan.xcodeproj/project.xcworkspace/xcuserdata/Lhs.xcu
serdatad/UserInterfaceState.xcuserstate