Index: lams_admin/conf/language/ApplicationResources.properties
===================================================================
diff -u -r364348244042df502f6bf898acfe76247bf4e4e4 -rbf253ef48e667bad4915bc92afb3e185a7fdc7ec
--- lams_admin/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 364348244042df502f6bf898acfe76247bf4e4e4)
+++ lams_admin/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision bf253ef48e667bad4915bc92afb3e185a7fdc7ec)
@@ -12,7 +12,7 @@
 errors.footer=</ul>
 errors.prefix=<li><font color=red>
 errors.suffix=</font></li>
-error.system = Oops! An unexpected exception thrown by the system. Ask the LAMS developers to investigate it! 
+error.system = Oops! An unexpected exception thrown by the system. Contact your System Administrator. 
 error.org.invalid = Invalid Organisation Id.
 error.orgtype.invalid = Invalid operation for this type of organisation.
 error.name.required = Name is required.
@@ -57,33 +57,15 @@
 admin.user.add = Add/Remove Users
 admin.user.create = Create New User
 admin.user.AUTHOR = Author
-admin.user.COURSE.ADMIN = Course Admin
-admin.user.COURSE.MANAGER = Course Manager
+admin.user.COURSE.ADMIN = Group Admin
+admin.user.COURSE.MANAGER = Group Manager
 admin.user.LEARNER = Learner
 admin.user.STAFF = Staff
+admin.course.manage = Manage Groups
+admin.class.manage = Manage Subgroups
+admin.class.add = Create New Subgroup
+admin.course.add = Create New Group
 
-#==================== Organisation Management Screen ======================#
-admin.organisation.management = Organisation Management
-admin.organisation.entry = Organisation Entry
-admin.job.list = Job List
-admin.list.job = List scheduled jobs in Quartz queue
-admin.organisation.name = Name
-admin.organisation.code = Code
-admin.organisation.description = Description
-admin.organisation.language = Language
-admin.organisation.country = Country
-admin.organisation.status = Status
-admin.can.add.user = Course Administrators can add new users
-admin.can.browse.user = Course Administrators can browse all users in the system
-admin.can.change.status = Course Administrators can change status of course
-admin.organisation = Organisation
-admin.course = Course
-admin.class = Class
-admin.course.manage = Manage Courses
-admin.class.manage = Manage Classes
-admin.class.add = Create New Class
-admin.course.add = Create New Course
-
 #======================== Management Screens =======================#
 admin.number = No.
 admin.in = In