Added the start of user control and roles
Merge branch 'master' of https://github.com/Woodhouse-bot/woodhouse