Merge branch 'merge-improvements-into-v1' into 'release-v1-routing'

configurations/evaluation/settingsDisasterRouter.txt

default_settings.txt

src/applications/DatabaseApplication.java

src/core/LocalDatabase.java

src/core/Message.java

src/core/MulticastMessage.java

src/report/BufferOccupancyReport.java

src/routing/DisasterRouter.java

src/routing/EpidemicRouter.java

src/routing/MessageChoosingStrategy.java

src/routing/choosers/EpidemicMessageChooser.java

src/routing/choosers/RescueModeMessageChooser.java

src/routing/choosers/UtilityMessageChooser.java

src/routing/prioritizers/DisasterPrioritizationStrategy.java

src/routing/util/DatabaseApplicationUtil.java

src/routing/util/DeliveryPredictabilityStorage.java

src/routing/util/DisasterBufferComparator.java

src/routing/util/EncounterValueManager.java

src/test/AbstractMessageChoosingStrategyTest.java

src/test/AbstractReportTest.java