Merge branch 'develop' of https://github.com/WillyMareka/southern_cross into develop
applicants
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