Index: /trunk/bin/systemstart_dev_practice_session.sh
===================================================================
--- /trunk/bin/systemstart_dev_practice_session.sh	(revision 663)
+++ /trunk/bin/systemstart_dev_practice_session.sh	(revision 679)
@@ -1,3 +1,14 @@
-#!/bin/sh
+#!/bin/bash
+
+# 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 practice script
 cd ../webapps
@@ -5,11 +16,11 @@
 sleep 1
 cd ..
-java -DPROP_FILE=cad_server_practice.properties -jar deploy/CADserver.jar &
+java -DCONFIG_DIR=config/devlinux -DPROP_FILE=cad_server_practice.properties -jar deploy/CADserver.jar &
 sleep 7
+python deploy/unifiedlogger.zip &
+
+sleep 2
 java -jar deploy/SimManager.jar practice_script_2016.xml &
 
-# Start Unified Logger Service
-python deploy/unifiedlogger.zip &
-sleep 5
 # Start a browser and run the web applications
 firefox localhost:8080/einotebook  localhost:8080/cptms localhost:8080/unifiedlogmonitor.html &
Index: /trunk/bin/CADclient.bat
===================================================================
--- /trunk/bin/CADclient.bat	(revision 384)
+++ /trunk/bin/CADclient.bat	(revision 679)
@@ -2,5 +2,5 @@
 
 cd ..
-java -Djava.util.logging.config.file=config/cad_client_logging.properties -jar deploy/CADClient.jar 
+java -Djava.util.logging.config.file=config/logging_cad_client.properties -jar deploy/CADClient.jar 
 
 
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
 
Index: /trunk/bin/systemstart_systest.bat
===================================================================
--- /trunk/bin/systemstart_systest.bat	(revision 669)
+++ /trunk/bin/systemstart_systest.bat	(revision 679)
@@ -27,3 +27,3 @@
 
 REM Launch a browser with our webapps
-"C:\Program Files\Mozilla Firefox\firefox.exe" localhost:80/einotebook  localhost:80/cptms localhost:80/unifiedlogmonitor.html
+"C:\Program Files (x86)\Mozilla Firefox\firefox.exe" localhost:80/einotebook  localhost:80/cptms localhost:80/unifiedlogmonitor.html
Index: /trunk/bin/systemstart_systest.sh
===================================================================
--- /trunk/bin/systemstart_systest.sh	(revision 674)
+++ /trunk/bin/systemstart_systest.sh	(revision 679)
@@ -1,7 +1,13 @@
-#!/bin/sh
+#!/bin/bash
 
 # 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 system test script
@@ -10,7 +16,8 @@
 sleep 1
 cd ..
-java -DPROP_FILE=cad_server_systest.properties -jar deploy/CADserver.jar &
+java -DCONFIG_DIR=config/devlinux -DPROP_FILE=cad_server_systest.properties -jar deploy/CADserver.jar &
 sleep 7
 python deploy/unifiedlogger.zip &
+
 sleep 2
 java -jar deploy/SimManager.jar system_test_script.xml &
@@ -18,2 +25,3 @@
 # Start a browser and run the web applications
 firefox localhost:8080/einotebook  localhost:8080/cptms localhost:8080/unifiedlogmonitor.html &
+
Index: /trunk/bin/postsession_logmerge.bat
===================================================================
--- /trunk/bin/postsession_logmerge.bat	(revision 675)
+++ /trunk/bin/postsession_logmerge.bat	(revision 679)
@@ -12,5 +12,6 @@
 
 REM 2. Define a variable for the directory containing the data files
-set dir="webapps\dynamicdata"
+REM dir="webapps\dynamicdata"
+set dir="w:\webapps\dynamicdata"
 
 REM 3. Merge the unified log with cad details and evaluation ratings
@@ -22,4 +23,4 @@
 REM 4. Next, launch the webserver and browse to localhost:8080/sessionlogdisplay.html 
 REM    to show a nicely formatted version of the results.
-"C:\Program Files\Mozilla Firefox\firefox.exe"  localhost:80/sessionlogdisplay.html  &
-
+"C:\Program Files (x86)\Mozilla Firefox\firefox.exe"  webapps.tmcsim/sessionlogdisplay.html  &
+REM "C:\Program Files (x86)\Mozilla Firefox\firefox.exe"  localhost:8080/sessionlogdisplay.html  &