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
Merge branch 'develop' of https://github.com/karsanrichard/southern_cross into develop
Changed the navigation for preamble at the bottom of page