refactored user login
added token parsing
added last edit date
Merge branch 'logout'