add authorization roles to users
merge master into feature branch
resolve schema conflicts