some changes to auth
more changes to auth
Merge branch 'develop' of https://github.com/johnotaalo/southern_cross-1 into develop