Index: lams_central/web/WEB-INF/web.xml
===================================================================
diff -u -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 -r775fdedefed0e3a8ae170d1e82fe1a5a58437e28
--- lams_central/web/WEB-INF/web.xml	(.../web.xml)	(revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929)
+++ lams_central/web/WEB-INF/web.xml	(.../web.xml)	(revision 775fdedefed0e3a8ae170d1e82fe1a5a58437e28)
@@ -149,18 +149,18 @@
 </listener>
 
    <servlet>
-      <servlet-name>storeLD</servlet-name>
-      <servlet-class>org.lamsfoundation.lams.authoring.web.StoreLDServlet</servlet-class>
+      <servlet-name>storeTheme</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.themes.web.StoreThemeServlet</servlet-class>
 
    </servlet>
    <servlet>
-      <servlet-name>storeTheme</servlet-name>
-      <servlet-class>org.lamsfoundation.lams.themes.web.StoreThemeServlet</servlet-class>
+      <servlet-name>flashCrashDump</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.web.FlashCrashDumpServlet</servlet-class>
 
    </servlet>
    <servlet>
-      <servlet-name>dumpWDDX</servlet-name>
-      <servlet-class>org.lamsfoundation.lams.web.ReportWddxStructureServlet</servlet-class>
+      <servlet-name>storeLD</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.authoring.web.StoreLDServlet</servlet-class>
 
    </servlet>
    <servlet>
@@ -208,11 +208,6 @@
 
    </servlet>
    <servlet>
-      <servlet-name>storeNotebookEntry</servlet-name>
-      <servlet-class>org.lamsfoundation.lams.notebook.web.StoreNBEntryServlet</servlet-class>
-
-   </servlet>
-   <servlet>
       <servlet-name>Connector</servlet-name>
       <servlet-class>org.lamsfoundation.lams.web.LAMSConnectorServlet</servlet-class>
 
@@ -229,11 +224,16 @@
 
    </servlet>
    <servlet>
-      <servlet-name>flashCrashDump</servlet-name>
-      <servlet-class>org.lamsfoundation.lams.web.FlashCrashDumpServlet</servlet-class>
+      <servlet-name>dumpWDDX</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.web.ReportWddxStructureServlet</servlet-class>
 
    </servlet>
+   <servlet>
+      <servlet-name>storeNotebookEntry</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.notebook.web.StoreNBEntryServlet</servlet-class>
 
+   </servlet>
+
  <servlet>
 	<servlet-name>action</servlet-name>
 	<servlet-class>
@@ -328,33 +328,33 @@
 </servlet-mapping>
 
    <servlet-mapping>
-      <servlet-name>storeLD</servlet-name>
-      <url-pattern>/servlet/authoring/storeLearningDesignDetails</url-pattern>
-   </servlet-mapping>
-   <servlet-mapping>
       <servlet-name>storeTheme</servlet-name>
       <url-pattern>/themes/servlet/storeTheme</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
-      <servlet-name>dumpWDDX</servlet-name>
-      <url-pattern>/servlet/dumpWDDX</url-pattern>
+      <servlet-name>flashCrashDump</servlet-name>
+      <url-pattern>/servlet/flashCrashDump</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
+      <servlet-name>storeLD</servlet-name>
+      <url-pattern>/servlet/authoring/storeLearningDesignDetails</url-pattern>
+   </servlet-mapping>
+   <servlet-mapping>
       <servlet-name>SimpleUploader</servlet-name>
       <url-pattern>/fckeditor/editor/filemanager/upload/simpleuploader</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
-      <servlet-name>storeNotebookEntry</servlet-name>
-      <url-pattern>/servlet/notebook/storeNotebookEntry</url-pattern>
-   </servlet-mapping>
-   <servlet-mapping>
       <servlet-name>Connector</servlet-name>
       <url-pattern>/fckeditor/editor/filemanager/browser/default/connectors/jsp/connector</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
-      <servlet-name>flashCrashDump</servlet-name>
-      <url-pattern>/servlet/flashCrashDump</url-pattern>
+      <servlet-name>dumpWDDX</servlet-name>
+      <url-pattern>/servlet/dumpWDDX</url-pattern>
    </servlet-mapping>
+   <servlet-mapping>
+      <servlet-name>storeNotebookEntry</servlet-name>
+      <url-pattern>/servlet/notebook/storeNotebookEntry</url-pattern>
+   </servlet-mapping>
 
    <session-config>
       <session-timeout>120</session-timeout>
@@ -467,9 +467,10 @@
     		<role-name>LEARNER</role-name>
     		<role-name>MONITOR</role-name>
     		<role-name>AUTHOR</role-name>
-    	    <role-name>COURSE MANAGER</role-name>
-    		<role-name>COURSE ADMIN</role-name>
+    	    <role-name>GROUP MANAGER</role-name>
+    		<role-name>GROUP ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
+    		<role-name>AUTHOR ADMIN</role-name>
     	</auth-constraint>
     </security-constraint>
 
@@ -480,6 +481,7 @@
     	</web-resource-collection>
     	<auth-constraint>
     		<role-name>AUTHOR</role-name>
+    		<role-name>AUTHOR ADMIN</role-name>
     	</auth-constraint>
     </security-constraint>
     <security-constraint>
@@ -501,9 +503,10 @@
     	<auth-constraint>
     		<role-name>AUTHOR</role-name>
     		<role-name>MONITOR</role-name>
-    	    <role-name>COURSE MANAGER</role-name>
-    		<role-name>COURSE ADMIN</role-name>
+    	    <role-name>GROUP MANAGER</role-name>
+    		<role-name>GROUP ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
+    		<role-name>AUTHOR ADMIN</role-name>
     	</auth-constraint>
     </security-constraint>
 
@@ -535,15 +538,19 @@
 	</security-role>
 
     <security-role>
-		<role-name>COURSE MANAGER</role-name>
+		<role-name>GROUP MANAGER</role-name>
 	</security-role>
    	<security-role>
-		<role-name>COURSE ADMIN</role-name>
+		<role-name>GROUP ADMIN</role-name>
 	</security-role>
 
 	<security-role>
 		<description>Can add/remove users to the system, set up classes of users for sessions</description>
 		<role-name>SYSADMIN</role-name>
 	</security-role>
 
+	<security-role>
+		<role-name>AUTHOR ADMIN</role-name>
+	</security-role>
+
 </web-app>