Merge branch 'develop' of https://github.com/bshaffer/oauth2-server-php into develop
fixes getUserCredentials by standardizing on 'user_id' for all fields