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
some changes
other configs
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
Saturday Night
nimetoa schemas
Merge branch 'develop' of https://github.com/johnotaalo/southern_cross-1 into develop
Merge branch 'develop' of https://github.com/johnotaalo/southern_cross-1 into develop
Changed some home images
return dbv
agian  of the returning
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>
Merge branch 'develop' of https://github.com/karsanrichard/southern_cross into develop

Conflicts:
	application/config/autoload.php
	application/config/config.php
	application/modules/applications/views/diploma_form.php
	dbv/data/schema/courses.sql
	dbv/data/schema/lecturers.sql
Added course short code to lecturer ID

Signed-off-by: Richard Karsan <karsanrichard@gmail.com>
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>