cancancan + roles for admin & manager users keep separate
Merge branch 'cancancan'