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
Announcements
new home page
Administrator
no message

Signed-off-by: karsanrichard <karsanrichard@gmail.com>
Merge branch 'develop' of https://github.com/karsanrichard/southern_cross into develop
redirect
Nimeongeza message nilisahau kuweka jana
Merge branch 'develop' of https://github.com/WillyMareka/southern_cross into develop
Home page messaging inasubmit.
Plus nimembongesha akasema next week
southerncross
That retardedly huge application form done.

Entry into db too.
Validation undone.
Home template still being done.

Signed-off-by: karsanrichard <karsanrichard@gmail.com>
redirecting
Merge branch 'develop' of https://github.com/karsanrichard/southern_cross into develop

Conflicts:
	application/config/autoload.php
Announcement bila CSS