update

Signed-off-by: 孙志刚 <zhigang.sun@i-soft.com.cn>
Merge branch 'master' of github.com:sunzhigang/private

Conflicts:
hosts

Signed-off-by: 孙志刚 <zhigang.sun@i-soft.com.cn>