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 }
Merge pull request #2174 from Sinza-/develop

Replace hard-coded strings with env.t on views/static folder and en/app.json