Fix spacing errors #2536
Fix version conflict
Merge branch 'fix-spaces' of git://github.com/Sinza-/habitrpg into
Sinza--fix-spaces
fix(translations): remove translations for privacy & terms
improve(translation): allow for data interpolation
refactor(translations): achievements
refactor(translations)
fix(party): Round boss health up instead of to nearest integer

If the boss has something like 0.2 HP it shows as 0 which is confusing
to the user. Let's round up instead.

Fixes #2504.
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop
refactor(translations)
Merge pull request #2550 from HabitRPG/paglias/translations-refactoring

Refactor translations
fix(translations): add env.t to rootScope
fix(find_uniq_user): fix
Mark collected items in collection quests
fix(paypal): fixes #2492, remove environment check for now, only have
production-mode option. revisit
Merge pull request #2553 from djuretic/mark_collected_items

Mark collected items in collection quests
Merge remote-tracking branch 'habitrpg/develop' into develop