kaartehan requests of bossing.
Merge remote branch 'origin/master'

Conflicts:
	src/core/database/DatabaseTool.java
	src/gui/CenterPanel.java
	src/gui/popup/UtilityPopup.java