don't require a role to get a user token
Merge branch 'master' into RELEASE_20140325