Index: lams_admin/web/WEB-INF/lams.tld
===================================================================
diff -u -r2deb6430189162e43922f84f227edb535b851ca2 -rfc1eae65cfee0ee25eedff87f9934dbb187041bd
--- lams_admin/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 2deb6430189162e43922f84f227edb535b851ca2)
+++ lams_admin/web/WEB-INF/lams.tld	(.../lams.tld)	(revision fc1eae65cfee0ee25eedff87f9934dbb187041bd)
@@ -13,6 +13,26 @@
 
    <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>    
+      </icon>
+      <name>role</name>
+      <tag-class>org.lamsfoundation.lams.web.tag.RoleTag</tag-class>
+      <body-content>empty</body-content>
+
+      <attribute>
+         <description>Converts role name into form usable as message resources key</description>
+         <name>role</name>
+         <required>true</required>
+
+           <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+
+   </tag>
+   <tag>
+
       <description>Output the Server URL as defined in the lams.xml configuration file.</description>
       <display-name>LAMS URL</display-name>
       <icon>    
@@ -64,6 +84,34 @@
    </tag>
    <tag>
 
+      <description>Help tag</description>
+      <display-name>Help tag</display-name>
+      <icon>    
+      </icon>
+      <name>help</name>
+      <tag-class>org.lamsfoundation.lams.web.tag.HelpTag</tag-class>
+      <body-content>empty</body-content>
+
+      <attribute>
+         <description>Help tag</description>
+         <name>module</name>
+         <required>true</required>
+
+           <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+      <attribute>
+         <description>Help tag</description>
+         <name>toolSignature</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>    
Index: lams_central/src/java/org/lamsfoundation/lams/web/tag/RoleTag.java
===================================================================
diff -u
--- lams_central/src/java/org/lamsfoundation/lams/web/tag/RoleTag.java	(revision 0)
+++ lams_central/src/java/org/lamsfoundation/lams/web/tag/RoleTag.java	(revision fc1eae65cfee0ee25eedff87f9934dbb187041bd)
@@ -0,0 +1,47 @@
+package org.lamsfoundation.lams.web.tag;
+
+import java.io.IOException;
+
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.tagext.SimpleTagSupport;
+
+import org.apache.commons.lang.StringUtils;
+/**
+ * JSP tag. Converts role name into form usable as message resources key.
+ * @jsp.tag name="role"
+ * 		body-content="empty"
+ * 		display-name="Converts role name into form usable as message resources key"
+ * 		description="Converts role name into form usable as message resources key"
+ * 
+ * @author jliew
+ *
+ */
+public class RoleTag extends SimpleTagSupport{
+	
+	private String role;
+	
+	@Override
+	public void doTag() throws JspException, IOException {
+		if(StringUtils.isEmpty(role)) getJspContext().getOut().write(role);
+		
+		role = role.replace(' ','.');
+		role = role.replaceFirst("COURSE", "GROUP");
+		getJspContext().getOut().write(role.toString());
+	}
+
+	/**
+	 * @jsp.attribute 
+	 * 		required="true" 
+	 * 		rtexprvalue="true"
+	 * 		description="Role name as given from database"
+	 * @return
+	 */
+	public String getRole() {
+		return role;
+	}
+
+	public void setRole(String role) {
+		this.role = role;
+	}
+
+}