Added relationship between users and roles
closes #24