second commit
add ability
	modified:   app/assets/javascripts/backbone/modules/admin/admin_head_menu/admin_head_menu_template.jst.ejs
	modified:   app/assets/javascripts/backbone/modules/admin/admin_head_menu/admin_head_menu_view.js
	new file:   app/assets/javascripts/backbone/modules/admin/edit_users/edit_user_template.jst.ejs
	new file:   app/assets/javascripts/backbone/modules/admin/edit_users/edit_user_view.js
	new file:   app/assets/javascripts/backbone/modules/admin/edit_users/edit_users.js
	new file:   app/assets/javascripts/backbone/modules/admin/edit_users/edit_users_template.jst.ejs
	new file:   app/assets/javascripts/backbone/modules/admin/edit_users/edit_users_view.js
	modified:   app/assets/javascripts/backbone/modules/order_liks/order_liks_template.jst.ejs
	modified:   app/assets/javascripts/backbone/modules/order_liks/order_liks_view.js
	modified:   app/assets/javascripts/backbone/modules/orders/order_view.js
	modified:   app/assets/javascripts/backbone/modules/user/user_view.js
	new file:   app/assets/javascripts/backbone/pages/admin/users/edit_users_template.jst.ejs
	new file:   app/assets/javascripts/backbone/pages/admin/users/edit_users_view.js
	modified:   app/assets/javascripts/backbone/requires.js
	modified:   app/assets/javascripts/backbone/routes.js
	modified:   app/assets/stylesheets/application.css
	new file:   app/assets/stylesheets/edit_user.css.scss
	modified:   app/controllers/likings_controller.rb
	modified:   app/controllers/urlslikes_controller.rb
	modified:   app/controllers/users_controller.rb
	modified:   app/models/liking.rb
	modified:   app/models/role.rb
	new file:   app/models/typeurl.rb
	modified:   app/models/urlslikes.rb
	modified:   app/models/user.rb
	modified:   config/routes.rb
	new file:   db/migrate/20131101163557_remove_username_from_user.rb
	new file:   db/migrate/20131102143851_add_is_ready_to_urlslikes.rb
	new file:   db/migrate/20131102144007_remove_is_busy_from_urlslikes.rb
	new file:   db/migrate/20131102145934_create_typeurls.rb
	new file:   db/migrate/20131102150529_add_typeurl_id_to_urlslikes.rb
	modified:   db/schema.rb
	modified:   db/seeds.rb
	new file:   test/fixtures/typeurls.yml
	new file:   test/unit/typeurl_test.rb
ful
	deleted:    app/assets/javascripts/admin.js.coffee
	deleted:    app/assets/javascripts/backbone/table/config.js
	deleted:    app/assets/javascripts/backbone/table/table.js
	deleted:    app/assets/javascripts/backbone/table/table_template.jst.ejs
	deleted:    app/assets/javascripts/backbone/table/table_view.js
	deleted:    app/assets/javascripts/backbone/table/tables.js
	deleted:    app/assets/javascripts/backbone/table/tables_template.jst.ejs
	deleted:    app/assets/javascripts/backbone/table/tables_view.js
	deleted:    app/assets/javascripts/home.js.coffee
	deleted:    app/controllers/tables_controller.rb
	deleted:    app/models/table.rb
	deleted:    app/views/admin/index.html.erb
	deleted:    app/views/tables/_form.html.erb
	deleted:    app/views/tables/edit.html.erb
	deleted:    app/views/tables/index.html.erb
	deleted:    app/views/tables/new.html.erb
	deleted:    app/views/tables/show.html.erb
	deleted:    db/migrate/20130706140623_devise_create_players.rb
	deleted:    db/migrate/20130706141942_create_tables.rb
	deleted:    test/fixtures/settings.yml
	deleted:    test/functional/admin_controller_test.rb
	deleted:    test/unit/helpers/admin_helper_test.rb
	deleted:    test/unit/setting_test.rb
like
	deleted:    app/controllers/urlslikes_controller.rb
dep commit
resolve conflict
	deleted:    app/assets/javascripts/vote.js.coffee
	deleted:    test/fixtures/typeurls.yml
	deleted:    test/fixtures/votes.yml
	deleted:    test/functional/vote_controller_test.rb
	deleted:    test/unit/helpers/vote_helper_test.rb
	deleted:    test/unit/typeurl_test.rb
	deleted:    test/unit/vote_test.rb
	modified:   Gemfile.lock
	modified:   app/assets/javascripts/application.js
	modified:   app/views/layouts/application.html.erb
	modified:   config.ru
	modified:   config/routes.rb
	deleted:    public/index.html
	modified:   Gemfile
	modified:   Gemfile.lock