changes to my controller
changes that needed ammendments
changes to the database
dbv Staff alters and additions
Merge branch 'develop' of https://github.com/johnotaalo/southern_cross-1 into develop
some changes to auth
more changes to auth
Merge branch 'develop' of https://github.com/johnotaalo/southern_cross-1 into develop
Chucked unwanted tables and updated DBV
some small changes
Merge branch 'develop' of https://github.com/johnotaalo/southern_cross-1 into develop

Conflicts:
	application/core/MY_Controller.php