More work on roles revamp. Removed rights_mask from User class.