some change
fixed application issue
Merge branch 'feature/login' of https://github.com/johnotaalo/southern_cross-1 into develop