From willy
Conflicts:
Some admin changes
Merge branch 'develop' of https://github.com/WillyMareka/southern_cross into develop
some changes
Merge branch 'master' of https://github.com/karsanrichard/southern_cross into develop
Administrator
redirect
Merge branch 'develop' of https://github.com/WillyMareka/southern_cross into develop

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

Conflicts:
	application/modules/home/controllers/home.php
Merge branch 'develop' of https://github.com/WillyMareka/southern_cross into develop
mere changes
Merge branch 'develop' of https://github.com/karsanrichard/southern_cross into develop
asdfghjkl;
I have no idea why this commit is here
Merge branch 'develop' of https://github.com/WillyMareka/southern_cross into develop

Conflicts:
	application/modules/announcements/views/announcement.php
Merge branch 'develop' of https://github.com/bakasajoshua/southern_cross into develop

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