Fixed #112
Merge branch 'fixes' into dev

Conflicts:
	Adm/Adm.php
	Adm/Gui/Windows/ServerControlMain.php