Merge branch 'master' into develop

lgsm/config-default/config-lgsm/kfserver/_default.cfg

@@ -83,8 +83,9 @@ compressedmapsdir="${rootdir}/Maps-Compressed"
 backupdir="${rootdir}/backups"
 
 ## Logging Directories
+logdir="${rootdir}/log"
 gamelogdir="${logdir}/server"
-scriptlogdir="${logdir}/script"
+lgsmlogdir="${logdir}/script"
 consolelogdir="${logdir}/console"
 gamelog="${gamelogdir}/${servicename}-game.log"
 lgsmlog="${lgsmlogdir}/${servicename}-script.log"
@@ -93,4 +94,4 @@ emaillog="${lgsmlogdir}/${servicename}-email.log"
 
 ## Logs Naming
 lgsmlogdate="${lgsmlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log"
-consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log"
+consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log"