Merge improvements into v1

Basically: Merge master in, then change DisasterRouter back to v1.

When reviewing, make sure everything looks okay (esp. in DisasterRouter) - but you don't have to review every single line as those were already reviewed when going into master. Also make sure all improvements (ticket #500) are included.

configurations/evaluation/settingsDisasterRouter.txt

 # Add this file as argument if you want to use DisasterRouter
 
 Group.router = DisasterRouter
+DisasterRouter.powerThreshold = 0.1
 
 # Parameters for rating mechanisms
 
@@ -15,14 +16,16 @@ EncounterValue.windowLength = 120
 ReplicationsDensity.windowLength = 120
 
 # Parameters for message choosing
-# ! TODO: Uncommented this once message choosing is implemented !
-# UtilityMessageChooser.dpWeight = 0.95
-# UtilityMessageChooser.powerWeight = 0.05
-# UtilityMessageChooser.prophetPlusWeight = 0.65
-# UtilityMessageChooser.rdWeight = 0.25
-# UtilityMessageChooser.evWeight = 0.1
-# UtilityMessageChooser.messageUtilityThreshold = 0.45
-# UtilityMessageChooser.powerThreshold = 0.1
+UtilityMessageChooser.dpWeight = 0.9
+UtilityMessageChooser.powerWeight = 0.1
+UtilityMessageChooser.prophetPlusWeight = 0.5
+UtilityMessageChooser.rdWeight = 0.35
+UtilityMessageChooser.evWeight = 0.15
+UtilityMessageChooser.messageUtilityThreshold = 0.45
+UtilityMessageChooser.powerThreshold = 0.1
+
+RescueModeMessageChooser.powerThreshold = 0.1
+RescueModeMessageChooser.shortTimespanThreshold = 1800
 
 # Parameters for prioritization
 DisasterPrioritization.headStartThreshold = 300
@@ -30,6 +33,5 @@ DisasterPrioritization.priorityThreshold = 5
 DisasterPrioritization.dpWeight = 0.5
 
 # Parameters for buffer management
-# ! TODO: Uncomment this once buffer management is implemented !
-# DisasterBufferComparator.hopThreshold = 5
-# DisasterBufferComparator.ageThreshold = 300
\ No newline at end of file
+DisasterBufferComparator.hopThreshold = 6
+DisasterBufferComparator.ageThreshold = 300
\ No newline at end of file