Merge branch 'master' of https://github.com/bshaffer/oauth2-server-demo
upgrades server and bridge to v0.7 tags