Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/OrganisationType.java
===================================================================
diff -u -r1454b2fd27486dd14b1ccf172b96df61a0b0d355 -re0ee3b559261a7e571f15d973e23bfc442b83951
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/OrganisationType.java	(.../OrganisationType.java)	(revision 1454b2fd27486dd14b1ccf172b96df61a0b0d355)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/OrganisationType.java	(.../OrganisationType.java)	(revision e0ee3b559261a7e571f15d973e23bfc442b83951)
@@ -36,6 +36,10 @@
 */
 public class OrganisationType implements Serializable {
 	
+	public static final Integer ROOT_TYPE = 1;
+	public static final Integer COURSE_TYPE = 2;
+	public static final Integer CLASS_TYPE = 3;
+	
 	public static final String ROOT_DESCRIPTION = "ROOT ORGANISATION";
 	public static final String COURSE_DESCRIPTION = "COURSE ORGANISATION";
 	public static final String CLASS_DESCRIPTION = "CLASS ORGANISATION";
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/Role.java
===================================================================
diff -u -re1d015f6bac58b1ca469873e3cb90a9c8049528f -re0ee3b559261a7e571f15d973e23bfc442b83951
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/Role.java	(.../Role.java)	(revision e1d015f6bac58b1ca469873e3cb90a9c8049528f)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/Role.java	(.../Role.java)	(revision e0ee3b559261a7e571f15d973e23bfc442b83951)
@@ -37,8 +37,6 @@
 */
 public class Role implements Serializable {
 
-	public static final String ADMIN = "ADMIN";
-
 	public static final String LEARNER = "LEARNER";
 	
 	public static final String STAFF = "STAFF";