some change
picha
Merge branch 'develop' of https://github.com/karsanrichard/southern_cross into develop
Changed the navigation for preamble at the bottom of page
Continued on some minor corrections
Corrections in course_details
Applied linking in  programs page
fixed application issue
Merge branch 'feature/login' of https://github.com/johnotaalo/southern_cross-1 into develop
Merge branch 'develop' of https://github.com/johnotaalo/southern_cross-1 into develop

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

Conflicts:
	application/modules/admin/models/m_admin.php
	application/modules/admin/views/application_view.php
fixed merge  issue in applications
i guess ni m_admin
Merge branch 'develop' of https://github.com/bakasajoshua/southern_cross into feature/login

Conflicts:
	application/modules/admin/models/m_admin.php
	application/modules/admin/views/application_view.php
switched models
Revision made in the student_courses
dashboard and admin sidebar
Merge branch 'feature/login' of https://github.com/johnotaalo/southern_cross-1 into develop

Conflicts:
	application/modules/admin/models/m_admin.php
	application/modules/admin/views/application_view.php
Removed some parts in the application form
modal window effects