Adding tokens to auth process
Merge branch 'master' into adding-auth-jc