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 apparent misalignment of paws on pets/mounts grids
prevent popover shadows from being clipped/overlapped
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
Take screenshot of failed e2e tests
Fix again e2e test
E2e tests: launch Selenium and node server and kill them after finishing the tests, using a test database
Test server port changed to 3001
Merge pull request #2112 from djuretic/e2e

End-to-end testing
#2217 start adding APIv2 generated documentation via swagger-node-express