fixed merge  issue in applications
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
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