将之前丢的代码恢复

将之前丢的代码恢复
test

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

Conflicts:
	cninsureClient/.DS_Store