Merge branch 'master' of https://github.com/michaelgruber/user-management