Index: lams_central/conf/xdoclet/filter-mappings.xml
===================================================================
diff -u -r4819c022d38c1e327a48f7f9961496f3366cfa29 -r414b1726ff93caea042f65c816e2bc332aad1bcd
--- lams_central/conf/xdoclet/filter-mappings.xml	(.../filter-mappings.xml)	(revision 4819c022d38c1e327a48f7f9961496f3366cfa29)
+++ lams_central/conf/xdoclet/filter-mappings.xml	(.../filter-mappings.xml)	(revision 414b1726ff93caea042f65c816e2bc332aad1bcd)
@@ -1,14 +1,89 @@
-  <filter-mapping>
+   <filter-mapping>
     <filter-name>SystemSessionFilter</filter-name>
-     <url-pattern>/*</url-pattern> 
-  </filter-mapping>
+     <url-pattern>*.do</url-pattern> 
+   </filter-mapping>
   
    <filter-mapping>
+    <filter-name>SystemSessionFilter</filter-name>
+     <url-pattern>*.jsp</url-pattern> 
+   </filter-mapping>
+  
+   <filter-mapping>
+    <filter-name>SystemSessionFilter</filter-name>
+     <url-pattern>*.xml</url-pattern> 
+   </filter-mapping>
+   
+   <filter-mapping>
+    <filter-name>SystemSessionFilter</filter-name>
+     <url-pattern>*.swf</url-pattern> 
+   </filter-mapping>
+  
+   <filter-mapping>
+    <filter-name>SystemSessionFilter</filter-name>
+     <url-pattern>/servlet/*</url-pattern> 
+   </filter-mapping>
+   
+   <filter-mapping>
+    <filter-name>SystemSessionFilter</filter-name>
+     <url-pattern>/fckeditor/*</url-pattern> 
+   </filter-mapping>
+  
+   <filter-mapping>
     <filter-name>hibernateFilter</filter-name>
-     <url-pattern>/*</url-pattern>
+     <url-pattern>*.do</url-pattern>
+   </filter-mapping>
+  
+   <filter-mapping>
+    <filter-name>hibernateFilter</filter-name>
+     <url-pattern>*.jsp</url-pattern>
   </filter-mapping>
   
+   <filter-mapping>
+    <filter-name>hibernateFilter</filter-name>
+     <url-pattern>*.xml</url-pattern>
+   </filter-mapping>
+   
+   <filter-mapping>
+    <filter-name>hibernateFilter</filter-name>
+     <url-pattern>*.swf</url-pattern>
+   </filter-mapping>
+  
+   <filter-mapping>
+    <filter-name>hibernateFilter</filter-name>
+     <url-pattern>/servlet/*</url-pattern>
+   </filter-mapping>
+  
   <filter-mapping>
+    <filter-name>hibernateFilter</filter-name>
+     <url-pattern>/fckeditor/*</url-pattern>
+   </filter-mapping>
+  
+   <filter-mapping>
     <filter-name>LocaleFilter</filter-name>
-     <url-pattern>/*</url-pattern>
+     <url-pattern>*.do</url-pattern>
+   </filter-mapping>
+   
+   <filter-mapping>
+    <filter-name>LocaleFilter</filter-name>
+     <url-pattern>*.jsp</url-pattern>
+   </filter-mapping>
+   
+   <filter-mapping>
+    <filter-name>LocaleFilter</filter-name>
+     <url-pattern>*.xml</url-pattern>
+   </filter-mapping>
+   
+   <filter-mapping>
+    <filter-name>LocaleFilter</filter-name>
+     <url-pattern>*.swf</url-pattern>
+   </filter-mapping>
+   
+   <filter-mapping>
+    <filter-name>LocaleFilter</filter-name>
+     <url-pattern>/servlet/*</url-pattern>
+   </filter-mapping>
+   
+    <filter-mapping>
+    <filter-name>LocaleFilter</filter-name>
+     <url-pattern>/fckeditor/*</url-pattern>
    </filter-mapping>
\ No newline at end of file
Index: lams_central/src/flash/org/lamsfoundation/lams/learner/Scratchpad.as
===================================================================
diff -u -r735adeb5d2ea7849b86d4991480630c4613fadec -r414b1726ff93caea042f65c816e2bc332aad1bcd
--- lams_central/src/flash/org/lamsfoundation/lams/learner/Scratchpad.as	(.../Scratchpad.as)	(revision 735adeb5d2ea7849b86d4991480630c4613fadec)
+++ lams_central/src/flash/org/lamsfoundation/lams/learner/Scratchpad.as	(.../Scratchpad.as)	(revision 414b1726ff93caea042f65c816e2bc332aad1bcd)
@@ -220,7 +220,7 @@
 		
 		var callback:Function = Proxy.create(this,onStoreEntryResponse);
 		
-		Application.getInstance().getComms().sendAndReceive(dto,"notebook/storeNotebookEntry",callback,false);
+		Application.getInstance().getComms().sendAndReceive(dto,"servlet/notebook/storeNotebookEntry",callback,false);
 		
 	}
 	
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/web/StoreLDServlet.java
===================================================================
diff -u -r85778860894cb37b9d17b1f4cb47915ff1ac4d6c -r414b1726ff93caea042f65c816e2bc332aad1bcd
--- lams_central/src/java/org/lamsfoundation/lams/authoring/web/StoreLDServlet.java	(.../StoreLDServlet.java)	(revision 85778860894cb37b9d17b1f4cb47915ff1ac4d6c)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/web/StoreLDServlet.java	(.../StoreLDServlet.java)	(revision 414b1726ff93caea042f65c816e2bc332aad1bcd)
@@ -44,7 +44,7 @@
  * @author Fiona Malikoff
  *
  * @web:servlet name="storeLD"
- * @web:servlet-mapping url-pattern="/authoring/storeLearningDesignDetails"
+ * @web:servlet-mapping url-pattern="/servlet/authoring/storeLearningDesignDetails"
  */
 public class StoreLDServlet extends AbstractStoreWDDXPacketServlet {
 
Index: lams_central/src/java/org/lamsfoundation/lams/notebook/web/StoreNBEntryServlet.java
===================================================================
diff -u -red35881d1862bc4c0594588815e995b2bb28aca0 -r414b1726ff93caea042f65c816e2bc332aad1bcd
--- lams_central/src/java/org/lamsfoundation/lams/notebook/web/StoreNBEntryServlet.java	(.../StoreNBEntryServlet.java)	(revision ed35881d1862bc4c0594588815e995b2bb28aca0)
+++ lams_central/src/java/org/lamsfoundation/lams/notebook/web/StoreNBEntryServlet.java	(.../StoreNBEntryServlet.java)	(revision 414b1726ff93caea042f65c816e2bc332aad1bcd)
@@ -43,7 +43,7 @@
  * @author Mitchell Seaton
  *
  * @web:servlet name="storeNotebookEntry"
- * @web:servlet-mapping url-pattern="/notebook/storeNotebookEntry"
+ * @web:servlet-mapping url-pattern="/servlet/notebook/storeNotebookEntry"
  */
 public class StoreNBEntryServlet extends AbstractStoreWDDXPacketServlet {
 
Index: lams_common/src/flash/org/lamsfoundation/lams/common/dict/Dictionary.as
===================================================================
diff -u -r36e1f54ab0b559b8fe2efeb83e7d2f6f01384075 -r414b1726ff93caea042f65c816e2bc332aad1bcd
--- lams_common/src/flash/org/lamsfoundation/lams/common/dict/Dictionary.as	(.../Dictionary.as)	(revision 36e1f54ab0b559b8fe2efeb83e7d2f6f01384075)
+++ lams_common/src/flash/org/lamsfoundation/lams/common/dict/Dictionary.as	(.../Dictionary.as)	(revision 414b1726ff93caea042f65c816e2bc332aad1bcd)
@@ -205,7 +205,7 @@
     public function saveToDisk():Void{
         //Convert to data object and then serialize before saving to a cookie
         var dataObj = toData();
-        CookieMonster.save(dataObj,'dictionary.' + _currentLanguage + '.' + app.module,true);
+        CookieMonster.save(dataObj,'dictionary.' + _currentLanguage + '.' + app.module,false);
 		var success = CookieMonster.save(_root.langDate, 'dictionary.date', true);
 		
 		if (!success) {
@@ -220,7 +220,7 @@
     public function openFromDisk():Void{
         Debugger.log('opening Dictionary from Shared Object',Debugger.CRITICAL,'openFromDisk','Dictionary');		
 	   
-		var dataObj:Object = CookieMonster.open('dictionary.' + _currentLanguage + '.' + app.module,true);
+		var dataObj:Object = CookieMonster.open('dictionary.' + _currentLanguage + '.' + app.module,false);
         createFromData(dataObj);
     }
     
Index: lams_common/src/flash/org/lamsfoundation/lams/common/util/Debugger.as
===================================================================
diff -u -r735adeb5d2ea7849b86d4991480630c4613fadec -r414b1726ff93caea042f65c816e2bc332aad1bcd
--- lams_common/src/flash/org/lamsfoundation/lams/common/util/Debugger.as	(.../Debugger.as)	(revision 735adeb5d2ea7849b86d4991480630c4613fadec)
+++ lams_common/src/flash/org/lamsfoundation/lams/common/util/Debugger.as	(.../Debugger.as)	(revision 414b1726ff93caea042f65c816e2bc332aad1bcd)
@@ -160,7 +160,7 @@
 		var callback:Function = Proxy.create(Debugger,onCrashDumpResponse);
 		
 		var comms = ApplicationParent.getInstance().getComms();
-        comms.sendAndReceive(dto, 'flashCrashDump',callback,false)
+        comms.sendAndReceive(dto, 'servlet/flashCrashDump',callback,false)
 		
     }