Added UserDAO.getUsersExcluding roles method
Removed UserDAO.getUsersExcluding ids, added UserService.getUsersExcluding roles
Merge remote-tracking branch 'origin/master'