Entity: User: added `gender` and `locale` properties
User: use `$property` variable instead of (undefined) `$name`, fixes possible notice
Merge pull request #108 from kornrunner/user-gender-locale

User gender and locale
Merge pull request #109 from kornrunner/user-undefined-variable

Use of undefined variable in `User` entity
Updating logic for populating the token expiration time. Assessing both expires_in and expires options while attempting to compensate for providers not staying standard to the spec.
Merge pull request #113 from jackshakes/pr-token-expires-option

Address issue with handling of 'expires' option in AccessToken entity
add an interface for injection typehints
Merge pull request #122 from pmjones/master

add an interface for injection typehints
Merge remote-tracking branch 'upstream/master' into grant-support