Merge remote-tracking branch 'origin/master'

application/ManiaControl.bat

@@ -1,6 +1,6 @@
 
 REM Set the path to your php.exe here
-set phpPath="D:\Programme\xampp\php\php.exe"
+set phpPath="D:\xampp\php\php.exe"
 
 REM Start ManiaControl
 START "" /B %phpPath% -f "ManiaControl.php" 2>&1

application/core/ManiaControl.php

@@ -129,7 +129,7 @@ class ManiaControl implements CommandListener {
 
 	/**
 	 * Quit ManiaControl and log the given message
-	 *
+	 *test
 	 * @param string $message        	
 	 */
 	public function quit($message = false) {

application/core/Settings/SettingManager.php

@@ -22,7 +22,6 @@ class SettingManager {
 	 * Private properties
 	 */
 	private $maniaControl = null;
-	private $configurator = null;
 	private $arrayDelimiter = ';;';
 
 	/**