Merge pull request #30 from nhart/6.x

Current user has one of the selected roles
make policy tab last in tab list