modified:   .gitignore
	modified:   Gemfile
	modified:   Gemfile.lock
	new file:   app/authorizers/application_authorizer.rb
	modified:   app/controllers/admin/categories_controller.rb
	modified:   app/controllers/admin/clients_controller.rb
	modified:   app/controllers/admin/contacts_controller.rb
	modified:   app/controllers/admin/conversations_controller.rb
	modified:   app/controllers/admin/interactions_controller.rb
	modified:   app/controllers/admin/invoices_controller.rb
	modified:   app/controllers/admin/messages_controller.rb
	modified:   app/controllers/admin/notes_controller.rb
	modified:   app/controllers/admin/posts_controller.rb
	modified:   app/controllers/admin/products_controller.rb
	modified:   app/controllers/admin/rate_types_controller.rb
	modified:   app/controllers/admin/services_controller.rb
	modified:   app/controllers/admin/settings_controller.rb
	modified:   app/controllers/admin/sponsors_controller.rb
	modified:   app/controllers/admin/tasks_controller.rb
	modified:   app/controllers/admin/tickets_controller.rb
        modified:   app/controllers/admin_controller.rb
	modified:   app/controllers/application_controller.rb
	deleted:    app/controllers/users_controller.rb
	modified:   app/models/role.rb
	modified:   app/models/user.rb
	modified:   config/database.yml
	new file:   config/initializers/authority.rb
	modified:   config/initializers/devise.rb
	deleted:    config/initializers/environment_variables.rb
	new file:   config/initializers/rolify.rb
	deleted:    config/initializers/the_role.rb
	modified:   config/routes.rb
	deleted:    db/migrate/20140523032727_add_role_id_to_users.rb
	deleted:    db/migrate/20140523032846_create_roles.the_role_engine.rb
	new file:   db/migrate/20140613032346_rolify_create_roles.rb
	modified:   db/schema.rb
	new file:   public/403.html
	new file:   test/fixtures/roles.yml
	new file:   test/models/role_test.rb