rolling back to string scopes
Merge branch 'v0.7' of github.com:cloud66/doorkeeper into v0.7