Replaced hard-coded strings with env.t on views/static folder and en/app.json contains it all.
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	locales/en/app.json
Delete locales/en/secondary.json
Update main.json

Remove comma at the end.
Replace hard coded strings for env.t on views/shared/ folder.
Merge branch 'develop' of https://github.com/Sinza-/habitrpg into develop

Replace hard coded strings for env.t on views/shared/.
Edit comma before }
fix #2064 - user.stats.buffs.int in UserSchema (woops, @sabrecat we were
looking in the wrong place!)
checklists: collapse individually
checklists #2198 click badge to collapse checklist @sabrecat
checklists #2198 don't collapse when in edit mode (that what you mean @sabrecat?)
fix apparent misalignment of paws on pets/mounts grids
prevent popover shadows from being clipped/overlapped
tasks: dbl-click saves a task when previously in edit-mode. @sabrecat
@wc8 it used to be it just closes the edit dialog, but I find myself
wanting to dblclick to save each time. Let me know if you think this is
a bad idea
#2200 change-password is showing for facebook-registered users for some reason
Starting e2e testing
E2e testing: added tests for failed login and register new user
Fix build
Fix build by giving more time to Protractor
Mute Selenium on Travis