add login token and password salt
Merge branch 'develop'