Merge branch 'dev'
Merge branch 'master' of github.com:cloudwu/skynet
update history for release