first oauth2 server bits not complete
Merge branch 'dev-1.0' of https://github.com/taftse/camelot-auth into dev-1.0