Fix spacing errors #2536
Fix version conflict
Merge branch 'fix-spaces' of git://github.com/Sinza-/habitrpg into
Sinza--fix-spaces