Index: lams_central/web/WEB-INF/lams.tld
===================================================================
diff -u -r3538b4ae424da479962e98b7528ad22b44cdd368 -r8179037dc958585c054547eb7de9be14c6aed233
--- lams_central/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 3538b4ae424da479962e98b7528ad22b44cdd368)
+++ lams_central/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 8179037dc958585c054547eb7de9be14c6aed233)
@@ -13,36 +13,48 @@
 
    <tag>
 
-      <description>Output the Server URL as defined in the lams.xml configuration file.</description>
-      <display-name>LAMS URL</display-name>
+      <description>Output the basic URL for the current webapp. e.g. http://server/lams/tool/nb11/</description>
+      <display-name>Base URL for the current web app</display-name>
       <icon>    
       </icon>
-      <name>LAMSURL</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.LAMSURLTag</tag-class>
+      <name>WebAppURL</name>
+      <tag-class>org.lamsfoundation.lams.web.tag.WebAppURLTag</tag-class>
       <body-content>empty</body-content>
 
    </tag>
    <tag>
 
-      <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
-      <display-name>Converts text from \n or \r\n to &lt;BR&gt; before rendering</display-name>
+      <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
+      <display-name>generate unique ID</display-name>
       <icon>    
       </icon>
-      <name>out</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.MultiLinesOutputTag</tag-class>
+      <name>generateID</name>
+      <tag-class>org.lamsfoundation.lams.web.tag.GenerateIDTag</tag-class>
       <body-content>empty</body-content>
 
       <attribute>
-         <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
-         <name>value</name>
-         <required>true</required>
+         <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
+         <name>id</name>
+         <required>false</required>
 
            <rtexprvalue>true</rtexprvalue>
 
       </attribute>
+
+   </tag>
+   <tag>
+
+      <description>Get the configuration value for the specified key</description>
+      <display-name>Configuration value</display-name>
+      <icon>    
+      </icon>
+      <name>Configuration</name>
+      <tag-class>org.lamsfoundation.lams.web.tag.ConfigurationTag</tag-class>
+      <body-content>empty</body-content>
+
       <attribute>
-         <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
-         <name>escapeHtml</name>
+         <description>Get the configuration value for the specified key</description>
+         <name>key</name>
          <required>false</required>
 
            <rtexprvalue>true</rtexprvalue>
@@ -52,6 +64,17 @@
    </tag>
    <tag>
 
+      <description>Output the Server URL as defined in the lams.xml configuration file.</description>
+      <display-name>LAMS URL</display-name>
+      <icon>    
+      </icon>
+      <name>LAMSURL</name>
+      <tag-class>org.lamsfoundation.lams.web.tag.LAMSURLTag</tag-class>
+      <body-content>empty</body-content>
+
+   </tag>
+   <tag>
+
       <description>Render html tag with direction and language</description>
       <display-name>Render html tag with direction and language</display-name>
       <icon>    
@@ -72,37 +95,25 @@
    </tag>
    <tag>
 
-      <description>Get the configuration value for the specified key</description>
-      <display-name>Configuration value</display-name>
+      <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
+      <display-name>Converts text from \n or \r\n to &lt;BR&gt; before rendering</display-name>
       <icon>    
       </icon>
-      <name>Configuration</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.ConfigurationTag</tag-class>
+      <name>out</name>
+      <tag-class>org.lamsfoundation.lams.web.tag.MultiLinesOutputTag</tag-class>
       <body-content>empty</body-content>
 
       <attribute>
-         <description>Get the configuration value for the specified key</description>
-         <name>key</name>
-         <required>false</required>
+         <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
+         <name>value</name>
+         <required>true</required>
 
            <rtexprvalue>true</rtexprvalue>
 
       </attribute>
-
-   </tag>
-   <tag>
-
-      <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-      <display-name>generate unique ID</display-name>
-      <icon>    
-      </icon>
-      <name>generateID</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.GenerateIDTag</tag-class>
-      <body-content>empty</body-content>
-
       <attribute>
-         <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-         <name>id</name>
+         <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
+         <name>escapeHtml</name>
          <required>false</required>
 
            <rtexprvalue>true</rtexprvalue>
@@ -112,17 +123,6 @@
    </tag>
    <tag>
 
-      <description>Output the basic URL for the current webapp. e.g. http://server/lams/tool/nb11/</description>
-      <display-name>Base URL for the current web app</display-name>
-      <icon>    
-      </icon>
-      <name>WebAppURL</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.WebAppURLTag</tag-class>
-      <body-content>empty</body-content>
-
-   </tag>
-   <tag>
-
       <description>Converts role name into form usable as message resources key</description>
       <display-name>Converts role name into form usable as message resources key</display-name>
       <icon>    
@@ -187,26 +187,6 @@
    </tag>
    <tag>
 
-      <description>Output details from the shared session UserDTO object</description>
-      <display-name>user details</display-name>
-      <icon>    
-      </icon>
-      <name>user</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.UserTag</tag-class>
-      <body-content>empty</body-content>
-
-      <attribute>
-         <description>Output details from the shared session UserDTO object</description>
-         <name>property</name>
-         <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
-      </attribute>
-
-   </tag>
-   <tag>
-
       <description>Output stylesheet based on the user preferences.</description>
       <display-name>User's chosen stylesheet</display-name>
       <icon>    
@@ -233,7 +213,27 @@
       </attribute>
 
    </tag>
+   <tag>
 
+      <description>Output details from the shared session UserDTO object</description>
+      <display-name>user details</display-name>
+      <icon>    
+      </icon>
+      <name>user</name>
+      <tag-class>org.lamsfoundation.lams.web.tag.UserTag</tag-class>
+      <body-content>empty</body-content>
+
+      <attribute>
+         <description>Output details from the shared session UserDTO object</description>
+         <name>property</name>
+         <required>true</required>
+
+           <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+
+   </tag>
+
   	<tag>
 		<name>STRUTS-textarea</name>
 		<tagclass>org.lamsfoundation.lams.web.tag.MultiLinesTextareaTag</tagclass>
@@ -431,8 +431,8 @@
        <path>/WEB-INF/tags/TabName.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>FCKEditor</name>
-       <path>/WEB-INF/tags/FCKEditor.tag</path>
+       <name>CKEditor</name>
+       <path>/WEB-INF/tags/CKEditor.tag</path>
    	</tag-file>
    	<tag-file>
        <name>AuthoringButton</name>