Merge pull request #5 from clusterapp/store-tokens-in-db

Move token from session to DB
Merge branch 'master' into smoke-tests