Merge pull request #6 from WiserTogether/auth-token-user-should-be-more-prioritized

change auth-middleware behavior: authenticated by token user will replac...
Merge branch 'master' into auth-token-user-should-be-more-prioritized