message
Merge branch 'master' of https://github.com/nikoooo/ArenanServer

Conflicts:
	src/database/DatabaseHandler.java