Merge branch 'hotfix-0.21'
Merge branch 'release-1.0'
Merge branch 'release-1.1'
Merge branch 'release-1.1.1'
Merge branch 'release-1.1.2'
Merge branch 'release-1.2'
Merge branch 'release-1.2.1'
Merge branch 'release-1.3.1'
fix some bugs, add new TIPS
Merge branch 'master' into develop
Merge branches 'master' and 'develop' of 192.168.160.20:wujinnnnn/gg into develop