add category japan
Merge branch 'hotfix' into develop
Merge branch 'develop'