Merge branch 'api-token-auth' into 'dev'

Add ability to get api key with oauth token

Closes #110

See merge request !83