Merge branch 'develop' of https://github.com/Alys/tools-for-habitrpg …

…into develop

Fixes a merge conflict that I created by adjusting history.