fix #1635
Merge branch 'develop' of https://github.com/lefnire/habitrpg into develop