making UserDAO and RoleDAO
Merge origin/master