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
Merge branch 'release-1.3.3'