Merge branch 'hotfix/tag-allow'
Merge branch 'master' into develop
add some forum manager
Merge branch 'hotfix/0.1.1' into develop