EPD-82: implemented timeout of dynamic predictor data
EPD-83 and EPD-84: transparency now increases with time, updated to bolder outline, switched color to green
Merge branch 'master' into 3.1
Changed to Apache license
Fixed root pom
Added basic serialization of VOCT data for EPD Ship
Added effort allocation to serialization
Merge branch 'master' of github.com:dma-enav/EPD
Added SRU persistency
Removed prints
Added semi working serialization for shore part of VOCT
Fixed AisLib dependency problem
Converted effort allocation to be stored in hashmap, changes needed for serialization on shore
Added better SRU and effort allocation for the EPD VOCT used in serializing
Merge branch 'master' of github.com:dma-enav/EPD
Merge branch 'master' of https://github.com/dma-enav/EPD into settings_optimization (new license + other minor changes)

Conflicts:
	epd-common/src/main/java/dk/dma/epd/common/prototype/layers/predictor/DynamicPredictorLayer.java
	epd-common/src/main/java/dk/dma/epd/common/prototype/model/voct/SearchPatternGenerator.java
	epd-common/src/main/java/dk/dma/epd/common/prototype/settings/AisSettings.java
	epd-common/src/main/java/dk/dma/epd/common/prototype/settings/CloudSettings.java
	epd-common/src/main/java/dk/dma/epd/common/prototype/settings/EnavSettings.java
	epd-common/src/main/java/dk/dma/epd/common/prototype/settings/GuiSettings.java
	epd-common/src/main/java/dk/dma/epd/common/prototype/settings/ISettingsObserver.java
	epd-common/src/main/java/dk/dma/epd/common/prototype/settings/MapSettings.java
	epd-common/src/main/java/dk/dma/epd/common/prototype/settings/NavSettings.java
	epd-common/src/main/java/dk/dma/epd/common/prototype/settings/SensorSettings.java
	epd-common/src/main/java/dk/dma/epd/common/prototype/settings/handlers/IIntendedRouteHandlerCommonSettingsObserver.java
	epd-common/src/main/java/dk/dma/epd/common/prototype/settings/layers/AisLayerCommonGlobalSettings.java
	epd-common/src/main/java/dk/dma/epd/common/prototype/settings/layers/AisLayerCommonLocalSettings.java
	epd-ship/src/main/java/dk/dma/epd/ship/gui/ChartPanel.java
	epd-ship/src/main/java/dk/dma/epd/ship/risk/RiskHandler.java
	epd-ship/src/main/java/dk/dma/epd/ship/settings/EPDCloudSettings.java
	epd-ship/src/main/java/dk/dma/epd/ship/settings/EPDEnavSettings.java
	epd-ship/src/main/java/dk/dma/epd/ship/settings/EPDGuiSettings.java
	epd-ship/src/main/java/dk/dma/epd/ship/settings/EPDMapSettings.java
	epd-ship/src/main/java/dk/dma/epd/ship/settings/EPDNavSettings.java
	epd-ship/src/main/java/dk/dma/epd/ship/settings/EPDS57LayerSettings.java
	epd-ship/src/main/java/dk/dma/epd/ship/settings/EPDSensorSettings.java
	epd-ship/src/main/java/dk/dma/epd/ship/settings/handlers/IIntendedRouteHandlerSettingsObserver.java
	epd-shore/src/main/java/dk/dma/epd/shore/settings/EPDAisSettings.java
	epd-shore/src/main/java/dk/dma/epd/shore/settings/EPDEnavSettings.java
	epd-shore/src/main/java/dk/dma/epd/shore/settings/EPDGuiSettings.java
	epd-shore/src/main/java/dk/dma/epd/shore/settings/EPDMapSettings.java
	epd-shore/src/main/java/dk/dma/epd/shore/settings/EPDNavSettings.java
	epd-shore/src/main/java/dk/dma/epd/shore/voct/VOCTManager.java