Add covariate display names list to model inputs
Remove covariate names dictionary from json metadata
Use display name from CSV
Update ModelOutputHandler testdata to include covariate display name
DB migration
Reflect DB rename changes in DTO
Use slimmer validation template on edit covariate name table
Indenting
Merge branch 'master' into 347-covariate-display-names

Conflicts:
	src/Common/test/uk/ac/ox/zoo/seeg/abraid/mp/common/dto/json/JsonModelRunLayerTest.java
	src/ModelWrapper/src/uk/ac/ox/zoo/seeg/abraid/mp/modelwrapper/model/ModelRunTemplate.ftl
	src/ModelWrapper/test/uk/ac/ox/zoo/seeg/abraid/mp/modelwrapper/model/ModelStatusReporterTest.java
	src/ModelWrapper/test/uk/ac/ox/zoo/seeg/abraid/mp/modelwrapper/web/ModelRunControllerIntegrationTest.java
	src/ModelWrapper/test/uk/ac/ox/zoo/seeg/abraid/mp/modelwrapper/web/ModelRunControllerTest.java
Handle extra column in results CSV, and use more realistic testdata in ModelOutputHandler
Hardcode results output CSVs in ModelRunTemplate.ftl
Preparation for merge conflict
Merge branch 'master' into 347-covariate-display-names

Conflicts:
	src/ModelOutputHandler/test/uk/ac/ox/zoo/seeg/abraid/mp/modeloutputhandler/web/testdata/valid_completed_outputs.zip
	src/ModelOutputHandler/test/uk/ac/ox/zoo/seeg/abraid/mp/modeloutputhandler/web/testdata/valid_failed_outputs_with_results.zip
Revert "Hardcode results output CSVs in ModelRunTemplate.ftl"

This reverts commit 7eaeb76c3038631354b5ba9eda0e0ff172e35926.
Merge pull request #303 from SEEG-Oxford/347-covariate-display-names

Covariate display names