Index: trunk/webapps/dynamicdata/incident_script.xml
===================================================================
--- trunk/webapps/dynamicdata/incident_script.xml	(revision 429)
+++ trunk/webapps/dynamicdata/incident_script.xml	(revision 434)
@@ -2162,4 +2162,16 @@
 		<TIME_INDEX>01:23:00</TIME_INDEX>
 		<INCIDENT LogNum="189">Suicide Attempt/Bomb Threat</INCIDENT>
+
+		<GENERAL_INFO> 
+			<TITLE>Incident Description</TITLE>
+			<TEXT>This is a suicide attempt and a bomb threat. A man with a bomb 
+		  strapped to him is threatening to blow up the interchange at I-405 and
+		  Jeffrey Road. The freeway interchange is shut down completely, causing 
+		  major backup in both directions on I-405. The man is eventually 
+		  apprehended after attempting to explode the bomb. The PD, additional 
+		  units, sign trucks, negotiator, and the bomb squad are sent to the 
+		  scene to assist.
+			</TEXT>
+		</GENERAL_INFO>
 		
 		<CAD_DATA>
@@ -2228,16 +2240,4 @@
 			
 		</CAD_DATA>	
-
-		<GENERAL_INFO> 
-			<TITLE>Incident Description</TITLE>
-			<TEXT>This is a suicide attempt and a bomb threat. A man with a bomb 
-		  strapped to him is threatening to blow up the interchange at I-405 and
-		  Jeffrey Road. The freeway interchange is shut down completely, causing 
-		  major backup in both directions on I-405. The man is eventually 
-		  apprehended after attempting to explode the bomb. The PD, additional 
-		  units, sign trucks, negotiator, and the bomb squad are sent to the 
-		  scene to assist.
-			</TEXT>
-		</GENERAL_INFO>
 
 		<CHP_RADIO RadioFile="18901.mp3">
@@ -3778,4 +3778,14 @@
 		<INCIDENT LogNum="191">RV Fire</INCIDENT>
 		
+		<GENERAL_INFO> 
+			<TITLE>Incident Description</TITLE>
+			<TEXT> This is an RV fire on the shoulder southbound 73 just north of 
+		   Bear/Baker Street. There are two injured victims who were pulled from 
+		   the RV by passers-by. The #3 is closed to fight the fire. 
+		   The fire department, paramedics, an extra unit, sign truck/s, and 
+		   ambulance are sent to the scene.
+			</TEXT>
+		</GENERAL_INFO>
+
 		<CAD_DATA>
 			<MASTER_INC_NUM>145086SLO007</MASTER_INC_NUM>
@@ -3818,14 +3828,4 @@
 		</CAD_DATA>		
 		
-		<GENERAL_INFO> 
-			<TITLE>Incident Description</TITLE>
-			<TEXT> This is an RV fire on the shoulder southbound 73 just north of 
-		   Bear/Baker Street. There are two injured victims who were pulled from 
-		   the RV by passers-by. The #3 is closed to fight the fire. 
-		   The fire department, paramedics, an extra unit, sign truck/s, and 
-		   ambulance are sent to the scene.
-			</TEXT>
-		</GENERAL_INFO>
-
 	</SCRIPT_EVENT>
 
Index: trunk/webapps/dynamicdata/highway_status.json
===================================================================
--- trunk/webapps/dynamicdata/highway_status.json	(revision 433)
+++ trunk/webapps/dynamicdata/highway_status.json	(revision 434)
@@ -4304,5 +4304,5 @@
        },
    "properties": 
-       {"street": "PAULARINO 2", "color": "yellow", "perpx": "0.725068", "perpy": "-0.688678"}
+       {"street": "PAULARINO 2", "color": "lime", "perpx": "0.725068", "perpy": "-0.688678"}
 },  
 {
@@ -4315,5 +4315,5 @@
        },
    "properties": 
-       {"street": "PAULARINO 2", "color": "yellow", "perpx": "0.719864", "perpy": "-0.694115"}
+       {"street": "PAULARINO 2", "color": "lime", "perpx": "0.719864", "perpy": "-0.694115"}
 },  
 {
@@ -4766,5 +4766,5 @@
        },
    "properties": 
-       {"street": "MACARTHU2", "color": "red", "perpx": "-0.710326", "perpy": "0.703873"}
+       {"street": "MACARTHU2", "color": "yellow", "perpx": "-0.710326", "perpy": "0.703873"}
 },  
 {
@@ -4777,5 +4777,5 @@
        },
    "properties": 
-       {"street": "DYER 1", "color": "red", "perpx": "0", "perpy": "0"}
+       {"street": "DYER 1", "color": "yellow", "perpx": "0", "perpy": "0"}
 },  
 {
@@ -4788,5 +4788,5 @@
        },
    "properties": 
-       {"street": "DYER 2", "color": "red", "perpx": "-0.708914", "perpy": "0.705295"}
+       {"street": "DYER 2", "color": "lime", "perpx": "-0.708914", "perpy": "0.705295"}
 },  
 {
@@ -4799,5 +4799,5 @@
        },
    "properties": 
-       {"street": "WARNER", "color": "red", "perpx": "-0.711107", "perpy": "0.703084"}
+       {"street": "WARNER", "color": "lime", "perpx": "-0.711107", "perpy": "0.703084"}
 },  
 {
@@ -4810,5 +4810,5 @@
        },
    "properties": 
-       {"street": "EDINGER 1", "color": "yellow", "perpx": "0", "perpy": "0"}
+       {"street": "EDINGER 1", "color": "lime", "perpx": "0", "perpy": "0"}
 },  
 {
@@ -12013,5 +12013,5 @@
        },
    "properties": 
-       {"street": "JAMBOREE1", "color": "yellow", "perpx": "0.400805", "perpy": "0.916164"}
+       {"street": "JAMBOREE1", "color": "lime", "perpx": "0.400805", "perpy": "0.916164"}
 },  
 {
@@ -12024,5 +12024,5 @@
        },
    "properties": 
-       {"street": "JAMBOREE2", "color": "red", "perpx": "0.400805", "perpy": "0.916164"}
+       {"street": "JAMBOREE2", "color": "lime", "perpx": "0.400805", "perpy": "0.916164"}
 },  
 {
@@ -12035,5 +12035,5 @@
        },
    "properties": 
-       {"street": "MACARTHUR 1", "color": "red", "perpx": "0.408917", "perpy": "0.912572"}
+       {"street": "MACARTHUR 1", "color": "lime", "perpx": "0.408917", "perpy": "0.912572"}
 },  
 {
@@ -12046,5 +12046,5 @@
        },
    "properties": 
-       {"street": "AIRPORT", "color": "red", "perpx": "0.321527", "perpy": "0.9469"}
+       {"street": "AIRPORT", "color": "lime", "perpx": "0.321527", "perpy": "0.9469"}
 },  
 {
@@ -12057,5 +12057,5 @@
        },
    "properties": 
-       {"street": "HOV AT 55N FLYOVER**", "color": "red", "perpx": "0.271933", "perpy": "0.962316"}
+       {"street": "HOV AT 55N FLYOVER**", "color": "lime", "perpx": "0.271933", "perpy": "0.962316"}
 },  
 {
@@ -12068,5 +12068,5 @@
        },
    "properties": 
-       {"street": "RED HILL", "color": "red", "perpx": "0.126754", "perpy": "0.991934"}
+       {"street": "RED HILL", "color": "lime", "perpx": "0.126754", "perpy": "0.991934"}
 },  
 {