Merge branch 'master' of github.com:tidepool-org/user-api
Merge branch 'master' of github.com:tidepool-org/user-api
Allow getUserInfo to accept email or username as well as ID, but only for server queries
Merge pull request #38 from tidepool-org/kjq/emailUserinfo

Kjq/email userinfo