fix login bug
rob add pk
Merge branch 'develop'
merge
Merge branch 'master' into develop
Merge branch 'develop' of https://github.com/fredericky/45eb9e92911a4f into develop