Fix applied_roles when resourcify and rolify used together
Changed default association_name back to roles
Added method alias to resolve conflict when model has resourcify and rolify
Merge commit '036f1b2'

* commit '036f1b2':
  Added method alias to resolve conflict when model has resourcify and rolify
  Changed default association_name back to roles
  Fix applied_roles when resourcify and rolify used together