Merge remote-tracking branch 'remotes/origin/master' into stop-the-madness

# Conflicts:
#	model/src/main/java/lcsb/mapviewer/model/graphics/ArrowType.java
#	model/src/main/java/lcsb/mapviewer/model/map/MiriamType.java
#	model/src/main/java/lcsb/mapviewer/model/user/ConfigurationElementTypeGroup.java
#	model/src/test/java/lcsb/mapviewer/model/AllModelTests.java
#	model/src/test/java/lcsb/mapviewer/model/log/AllLogTests.java
#	persist/src/test/java/lcsb/mapviewer/persist/AllDbTests.java
#	persist/src/test/java/lcsb/mapviewer/persist/dao/AllDaoTests.java
#	persist/src/test/java/lcsb/mapviewer/persist/dao/log/AllLogTests.java
#	service/src/main/java/lcsb/mapviewer/services/utils/data/BuildInLayout.java
#	service/src/main/java/lcsb/mapviewer/services/utils/data/ColorSchemaColumn.java
#	service/src/test/java/lcsb/mapviewer/services/impl/LayoutServiceTest.java
#	service/src/test/java/lcsb/mapviewer/services/impl/ProjectServiceTest.java

Comment: Resolved by "Accept Theirs".
Will fix the comments again via regex rather than manual merging.