Merge branch 'resource-owner-password-grant'

Closes #14
Closes #15