Revert "Merge remote-tracking branch 'upstream/dev-0.3' into dev-0.3"

This reverts commit 040e6ca0f8db908a96f5853ed97a5d7cf5bbf21d, reversing
changes made to 2d69aa87539c984f4c2ef79a9f6469924fb28afc.

Conflicts:
	src/app/language/en.json