JOJ-12 Small fixes to THREDDS test URL and unit tests
Changes following code-review
JOJ-8 Adding Catalogue page for Model Runs
Merge remote-tracking branch 'remotes/origin/JOJ-1' into JOJ-5

Conflicts:
	.idea/jules-jasmin.iml
	joj/controllers/model_run.py
	joj/services/model_run_service.py
	joj/tests/integration/model_run_service_test.py
	joj/utils/constants.py
	joj/websetup.py
Move code to majic directory