===
Merge branch 'master' of https://github.com/datangcloud/130803-----

Conflicts:

cninsureClient/cninsureClient.xcodeproj/project.xcworkspace/xcuserdata/d
atcloud.xcuserdatad/UserInterfaceState.xcuserstate
===