Replaced adapter with specific role_adapter and resource_adapter
Fix applied_roles when resourcify and rolify used together
Merge branch 'applied_roles_fix' into solid
Changed default association_name back to roles
Merge branch 'applied_roles_fix' into solid
Added method alias to resolve conflict when model has resourcify and rolify
Merge branch 'applied_roles_fix' into solid
Added .rb to migrations
Updated travis settings to specific rails version
Changed generators to allow multiple user classes

(cherry picked from commit 4f7c0f9efa5cf6c3146d427612efd8e1bcd2961e)