Merge branch 'feature/RefactorConfig' into liveSystem

Conflicts:
	daemon/simpleExecutionScript.php5