Merge branch 'branch-1.2.0' of https://github.com/tencent/angel into …

…branch-1.2.0

Merge remote-tracking branch 'remotes/origin/branch-1.0.0'

Merge branch 'branch-1.0.0'

# Conflicts:
#	docs/deploy/source_compile.md