Update doorkeeper to work with API Client
Merge branch 'master' into group-generation