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 8d16138956ee08acf2990fc6e5391b0fe9257b78)
Added 'any instance' capability to User.with_role

(cherry picked from commit b90594fd5e64d9d954c50e54777e7a3f6949707b)

Conflicts:
	lib/rolify/finders.rb