Start of user authentication process
test permissions model
Merge branch 'master' into permissions