Merge branch 'master' into '557-pathways-and-compartments'
# Conflicts: # model-command/src/main/java/lcsb/mapviewer/commands/CreateHierarchyCommand.java # service/src/main/java/lcsb/mapviewer/services/impl/ProjectService.java # service/src/test/java/lcsb/mapviewer/services/impl/ProjectServiceTest.java