Merge branch 'master' into feat/postgresql-database

# Conflicts:
#	database/sql/1-db_database.sql
#	docker-compose.yml
#	pom.xml
#	scripts/npc/mapleTV.js
#	src/main/java/net/server/Server.java

src/main/java/net/server/Server.java

@@ -57,6 +57,7 @@ import database.maker.MakerInfoProvider;
 import database.maker.MakerRepository;
 import database.migration.FlywayRunner;
 import database.monsterbook.MonsterCardRepository;
+import database.DatabaseMigrations;
 import database.note.NoteDao;
 import database.shop.ShopDao;
 import net.ChannelDependencies;
@@ -713,6 +714,8 @@ public class Server {
             throw new IllegalStateException("Failed to initiate a connection to the database");
         }
 
+        DatabaseMigrations.runDatabaseMigrations();
+
         channelDependencies = registerChannelDependencies(pgDbConnection);
 
         final ExecutorService initExecutor = Executors.newFixedThreadPool(10);