First draft
Merge branch 'master' into 293-raster-file-system

Conflicts:
	src/ModelOutputHandler/src/uk/ac/ox/zoo/seeg/abraid/mp/modeloutputhandler/beans.xml
Fix tests
Merge branch 'master' into 293-raster-file-system

Conflicts:
	src/Common/src/uk/ac/ox/zoo/seeg/abraid/mp/common/service/workflow/DiseaseOccurrenceValidationServiceImpl.java
Fixes following Travis and review
Fix following Travis
Fix following review
Merge pull request #225 from SEEG-Oxford/293-raster-file-system

Use rasters from the file system when calculating environmental suitability
Merge branch 'master' into 309-exclude-country-points

Conflicts:
	src/Common/src/uk/ac/ox/zoo/seeg/abraid/mp/common/service/workflow/DiseaseOccurrenceValidationServiceImpl.java
Update test data
Remove redundant boolean
Move and test the check for country location