Merge branch 'develop' of http://github.com/bshaffer/oauth2-server-php into develop