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
Merge branch 'develop' of https://github.com/WillyMareka/southern_cross into develop
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>
Merge branch 'develop' of https://github.com/karsanrichard/southern_cross into develop

Conflicts:
	application/modules/admin/controllers/admin.php
	application/modules/admin/models/m_admin.php
	application/modules/admin/views/application_view.php
	dbv/data/schema/courses.sql
Lecturer registration now working