Merge branch 'develop' of https://github.com/johnotaalo/southern_cross-1 into develop

Conflicts:
	application/config/autoload.php
	application/config/config.php
	application/modules/admin/controllers/admin.php
Merge branch 'develop' of https://github.com/WillyMareka/southern_cross into develop
administrator
Merge branch 'develop' of https://github.com/WillyMareka/southern_cross into develop

Conflicts:
	application/config/autoload.php
	application/config/config.php
	application/modules/admin/controllers/admin.php
removed the schema files from dbv
Merge branch 'develop' of https://github.com/karsanrichard/southern_cross into develop
Merge branch 'develop' of https://github.com/WillyMareka/southern_cross into develop
Saturday Night
WARNING:DO NOT EDIT CODE YOU DIDNT WRITE WITHOUT CONSULTATION
In unrelated news:
Made the form work again
Added the other(specify) additions to the system
Working on the addition of lecturers still
Lecturer Registration
Other options in form made

refer to file in Information folder for tables to re-import from me

Signed-off-by: Richard Karsan <karsanrichard@gmail.com>
Added course short code to lecturer ID

Signed-off-by: Richard Karsan <karsanrichard@gmail.com>
revision path
Merge branch 'develop' of https://github.com/bakasajoshua/southern_cross

Signed-off-by: Richard Karsan <karsanrichard@gmail.com>

Conflicts:
	application/config/autoload.php
	application/config/config.php
	application/modules/admin/controllers/admin.php
	dbv/data/schema/applicant_additional_info.sql
	dbv/data/schema/applicant_religion_info.sql
	dbv/data/schema/courses.sql
	dbv/data/schema/lecturers.sql
no message

Signed-off-by: Richard Karsan <karsanrichard@gmail.com>