If a model run request fails, the transaction is now rolled back for the current disease group.
Ensure that transactions are rolled back upon any exception being thrown (by default it only happens for RuntimeExceptions).
Remove duplicate retrieval of disease occurrences for model run request.
Do not send disease occurrences with final weighting = 0 to the model. This includes locations with country precision (hence a clause can be removed from the getDiseaseOccurrencesForModelRunRequest named query).
Fix to logging following pull request review. Temporary fix to MainTest (change times(1) to atLeastOnce()).
Merge branch 'master' into 156-model-run-request-timing

Conflicts:
	src/DataAcquisition/src/uk/ac/ox/zoo/seeg/abraid/mp/dataacquisition/Main.java
	src/DataAcquisition/src/uk/ac/ox/zoo/seeg/abraid/mp/dataacquisition/model/ModelRunManager.java
	src/DataAcquisition/src/uk/ac/ox/zoo/seeg/abraid/mp/dataacquisition/weightings/WeightingsCalculator.java
	src/DataAcquisition/test/uk/ac/ox/zoo/seeg/abraid/mp/dataacquisition/model/ModelRunRequesterIntegrationTest.java
	src/DataAcquisition/test/uk/ac/ox/zoo/seeg/abraid/mp/dataacquisition/weightings/WeightingsCalculatorIntegrationTest.java
	src/ModelWrapper/src/uk/ac/ox/zoo/seeg/abraid/mp/modelwrapper/model/data/OccurrenceDataWriterImpl.java
Fix incorrect merges (and make minor fixes)
Fix test
Merge pull request #107 from SEEG-Oxford/156-model-run-request-timing

Model run request tidy-ups