fixed login
Merge branch 'develop' of github.com:CH-JesseMa/karma_app into css100
Merge branch 'develop' of github.com:CH-JesseMa/karma_app into develop