Index: trunk/bin/systemstart_dev_full_session.sh
===================================================================
--- trunk/bin/systemstart_dev_full_session.sh	(revision 648)
+++ trunk/bin/systemstart_dev_full_session.sh	(revision 679)
@@ -1,5 +1,15 @@
 #!/bin/sh
+
+# Kill any process leftover from previous run
+kill $(ps  aux | grep "[p]ython -m CGIHTTPServer 8080" | awk '{print $2}')
+kill $(ps  aux | grep "[p]ython deploy/unifiedlogger.zip" | awk '{print $2}')
+
+# Get path to this script
+# $0 contains path to the script file, even if launched from file manager
+SCRIPT_PATH=$(dirname "$(readlink -f "$0")")
+# CD to the script folder
+cd "$SCRIPT_PATH"
+
 # Start the Simulator System with the full incident script
-
 cd ../webapps
 # Delete any existing CADcomments.log
@@ -10,5 +20,5 @@
 sleep 1
 cd ..
-java -jar deploy/CADserver.jar &
+java -DCONFIG_DIR=config/devlinux -jar deploy/CADserver.jar &
 sleep 10
 java -jar deploy/SimManager.jar full_script_2016.xml &
@@ -21,5 +31,5 @@
 
 sleep 10
-java -jar deploy/CADclient.jar &
+java -DCONFIG_DIR=config/devlinux -jar deploy/CADclient.jar &
 sleep 5