Clean up
Merge branch 'membership' of https://github.com/iofjuupasli/UserManager into membership