Merging remaining changes from branch

application/controllers/ApprovalbodyadminController.php

application/controllers/AuthController.php

application/controllers/ConflictController.php

application/controllers/CourseadminController.php

application/controllers/HomeController.php

application/controllers/TestController.php

application/controllers/UseradminController.php

application/library/Local/Db/CourseTableMany.php

application/library/Local/Db/CourseTableOne.php

application/models/rows/ApprovalBody.php

application/models/rows/ApprovalBodyRole.php

application/models/rows/Asset.php

application/models/rows/CourseCode.php

application/models/rows/CourseCrosslisting.php

application/models/rows/CourseGeneration.php

application/models/rows/Group.php

application/models/rows/GroupImpliedMembership.php

application/models/rows/Person.php

application/models/rows/Request.php

application/models/tables/ActivityTypes.php