Index: lams_tool_laqa/web/WEB-INF/lams.tld
===================================================================
diff -u -r6b48d7643dda77bdad77a24c3af3f0b3d9cec1c2 -r0db83894504dc7652d3670a6ce496605b961faa1
--- lams_tool_laqa/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 6b48d7643dda77bdad77a24c3af3f0b3d9cec1c2)
+++ lams_tool_laqa/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 0db83894504dc7652d3670a6ce496605b961faa1)
@@ -24,6 +24,46 @@
    </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>
+      <icon>    
+      </icon>
+      <name>out</name>
+      <tag-class>org.lamsfoundation.lams.web.tag.MultiLinesOutputTag</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>
+
+           <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+
+   </tag>
+   <tag>
+
+      <description>Render html tag with direction and language</description>
+      <display-name>Render html tag with direction and language</display-name>
+      <icon>    
+      </icon>
+      <name>html</name>
+      <tag-class>org.lamsfoundation.lams.web.tag.HtmlTag</tag-class>
+      <body-content>JSP</body-content>
+
+      <attribute>
+         <description>Render html tag with direction and language</description>
+         <name>xhtml</name>
+         <required>false</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>    
@@ -287,14 +327,10 @@
        <path>/WEB-INF/tags/TabBody.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>HTMLEditor</name>
-       <path>/WEB-INF/tags/HTMLEditor.tag</path>
+       <name>FCKEditor</name>
+       <path>/WEB-INF/tags/FCKEditor.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>SetEditor</name>
-       <path>/WEB-INF/tags/SetEditor.tag</path>
-   	</tag-file>
-   	<tag-file>
        <name>AuthoringButton</name>
        <path>/WEB-INF/tags/AuthoringButton.tag</path>
    	</tag-file>   	
@@ -314,5 +350,9 @@
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
    	</tag-file>  
+   	<tag-file>
+	    <name>DefineLater</name>
+		<path>/WEB-INF/tags/DefineLater.tag</path>
+   	</tag-file>  
 
 </taglib>