Merge branch '226-add-new-disease-group' into 200-edit-disease-extent-parameters
Merge remote-tracking branch 'origin/215-disease-extent-parameters' into 200-edit-disease-extent-parameters
View Model, panel on UI, controller methods
Test
Merge branch 'master' into 200-edit-disease-extent-parameters

Conflicts:
	src/Common/src/uk/ac/ox/zoo/seeg/abraid/mp/common/dao/NativeSQLImpl.java
	src/PublicSite/web/css/main.css
Tests
Merge branch 'master' into 200-edit-disease-extent-parameters

Conflicts:
	src/Common/src/uk/ac/ox/zoo/seeg/abraid/mp/common/domain/DiseaseExtent.java
Fix quirk: use id instead of date
Ignore GDAL error
Ignore GDAL error
Logging on controller
Refresh Disease Group Setup panel when settings and parameters are saved
Form group macro
Merge pull request #159 from SEEG-Oxford/200-edit-disease-extent-parameters

Edit disease extent parameters
Merge branch 'master' into 59-expert-admin

Conflicts:
	src/PublicSite/web/js/app/admin/diseasegroups/DiseaseGroupSetupViewModel.js
	src/PublicSite/web/js/app/spec/SpecRunner.html
	src/PublicSite/web/js/app/spec/admin/diseasegroups/DiseaseGroupAdministrationViewModelSpec.js
	src/PublicSite/web/js/app/spec/admin/diseasegroups/DiseaseGroupPayloadSpec.js
	src/PublicSite/web/js/app/spec/admin/diseasegroups/DiseaseGroupSetupViewModelSpec.js
	src/PublicSite/web/js/kickstart/admin/diseaseGroup.js