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

Conflicts:
	application/config/autoload.php
	application/modules/admin/controllers/admin.php
Merge branch 'develop' of https://github.com/WillyMareka/southern_cross into develop

Conflicts:
	application/config/autoload.php
	application/modules/admin/controllers/admin.php
Merge branch 'develop' of https://github.com/johnotaalo/southern_cross-1 into develop

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

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

Conflicts:
	application/modules/home/views/contacts.php
Removed uploaded photos... Make sure you run the revisions
Added the download application form on the homepage
Merge branch 'develop' of https://github.com/johnotaalo/southern_cross-1

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