Merge pull request #604 from bhariharan/master

Fixing token refresh intent
Make synchronization per DB