Validation weighting should be null if both expert weighting and machine weighting are null
If the model hasn't yet been run or there is no disease extent for this disease group, set machine weighing to null and is_validated to true, to allow initial model run / disease extent generation to take place.
Separate into two queries so that (1) validation and final weightings only set once (for occurrences with final weighting currently null) and (2) model run request excludes occurrences where final weighting is null
Ensure nulls are ignored in calculating average
Tidy up static import
Ensure location resolution weighting not null, used as final weighting when validation weighting is null
Merge branch 'master' into 195-null-machine-weighting

Conflicts:
	src/Common/src/uk/ac/ox/zoo/seeg/abraid/mp/common/service/workflow/DiseaseOccurrenceValidationServiceImpl.java
	src/Common/test/uk/ac/ox/zoo/seeg/abraid/mp/common/service/workflow/DiseaseOccurrenceValidationServiceTest.java
	src/DataAcquisition/src/uk/ac/ox/zoo/seeg/abraid/mp/dataacquisition/model/ModelRunManager.java
Tidy up merge
Remove Validation Parameters Handler
Occurrence GeoJson (Modelling View) should use final weighting, not validation weighting
Merge branch 'master' into 195-null-machine-weighting

Conflicts:
	src/Common/test/uk/ac/ox/zoo/seeg/abraid/mp/common/service/workflow/support/WeightingsCalculatorIntegrationTest.java
	src/DataAcquisition/src/uk/ac/ox/zoo/seeg/abraid/mp/dataacquisition/model/ModelRunManager.java
Static method
Package-level visibility
Merge pull request #137 from SEEG-Oxford/195-null-machine-weighting

Weighting fixes