Move language out of main navigation
Add SimpleJSON to requirements.txt
Move language out of main navigation
Merge branch 'develop' of github.com:WorldBank-Transport/open-transit-indicators into develop
Minor style fixes

More style updates

More style updates
Change scenarios page to filter
Remove moved code from rootcontroller
Merge pull request #593 from WorldBank-Transport/feature/language-modal

Feature/language modal
Remove test code
Fix colleague styling
Merge branch 'develop' into feature/style-clean-up

Conflicts:
	js/angular/app/scripts/modules/scenarios/list/list-partial.html
Merge branch 'feature/style-clean-up' into develop
Merge branch 'develop' of github.com:WorldBank-Transport/open-transit-indicators into develop

Conflicts:
	js/angular/app/scripts/modules/userdata/change-language-controller.js
Fixes to the jobs indicator. wip.
Merge remote-tracking branch 'upstream/develop' into jobs-indicator-update
Fixes to the jobs indicator, with tests.
Fixed a hard coded string in a test.
Jobs indicator now reports ratio of reachable jobs / population per cell
Merge pull request #595 from lossyrob/jobs-indicator-update

Jobs indicator update
Prevent infinity result