Merge branch 'develop' of https://github.com/bakasajoshua/southern_cross into develop
no message
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
	application/modules/home/views/services.php
Did some correction that might have arrived during merging
Error
Corrections after merging with Adimas
Fixed my google map of kisumu-kibuye
no message
Did a lot of corrections that had occurred
More modifications
Tried to do clear and visible navigations but failed
Login has been made
Add user manually to system and test
Only super admin user type will be redirected as i dont have the other interfaces yet

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

Conflicts:
	application/config/autoload.php
	application/modules/admin/controllers/admin.php
Navigation ya contact iko kind of poa
Merge branch 'develop' of https://github.com/johnotaalo/southern_cross-1

Conflicts:
	application/modules/admin/controllers/admin.php
	application/modules/admin/models/m_admin.php
Merge branch 'develop' of https://github.com/WillyMareka/southern_cross

Conflicts:
	application/modules/admin/controllers/admin.php
	application/modules/home/views/home.php
Student Admission Changes
changes to students
just a minor change to the function
Merge branch 'develop' of https://github.com/WillyMareka/southern_cross into develop

Conflicts:
	application/config/autoload.php
	application/modules/admin/controllers/admin.php