added token authentication
Merge branch 'master' into tokens