Merge branch 'develop' of https://github.com/WillyMareka/southern_cross into develop
applicants
Merge branch 'develop' of https://github.com/WillyMareka/southern_cross

Conflicts:
	application/modules/admin/controllers/admin.php
	application/modules/home/views/home.php
Login done and visibility issue solved
Merge branch 'develop' of https://github.com/johnotaalo/southern_cross-1

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

Conflicts:
	application/modules/admin/controllers/admin.php
	application/modules/home/views/home.php
admin
Merge branch 'develop' of https://github.com/bakasajoshua/southern_cross into develop

Conflicts:
	application/modules/admin/models/m_admin.php
	application/modules/admin/views/application_view.php
Merge branch 'develop' of https://github.com/karsanrichard/southern_cross into develop

Conflicts:
	application/modules/admin/controllers/admin.php
	application/modules/home/views/home.php
Merge branch 'develop' of https://github.com/MesAdima/southern_cross into develop
Merge branch 'develop' of https://github.com/karsanrichard/southern_cross into develop

Conflicts:
	application/modules/admin/controllers/admin.php
	application/modules/home/views/home.php
picha
Merge branch 'develop' of https://github.com/karsanrichard/southern_cross into develop
Changed the navigation for preamble at the bottom of page
some home page changes
Merge branch 'develop' of https://github.com/WillyMareka/southern_cross into develop

Conflicts:
	application/modules/admin/controllers/admin.php
	application/modules/home/views/home.php