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

Conflicts:
	application/config/autoload.php
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
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/karsanrichard/southern_cross into develop

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