checkoutするためにいったんコミット
20140224 agent対応
Merge branch 'master' of github.com:MiraitSystems/enju_trunk

Conflicts:
	app/controllers/orders_controller.rb
	app/controllers/payments_controller.rb
	app/models/ability.rb
	app/models/agent.rb
	app/models/keycode.rb
	app/models/order.rb
	app/models/payment.rb
	app/views/orders/_form.html.erb
	app/views/orders/index.html.erb
	app/views/orders/show.html.erb
	app/views/page/configuration.html.erb
	app/views/payments/index.html.erb
	config/locales/translation_en.yml
	config/locales/translation_ja.yml
	config/routes.rb
Merge branch 'master' of github.com:MiraitSystems/enju_trunk

Conflicts:
	app/controllers/orders_controller.rb
	app/controllers/payments_controller.rb
	app/models/agent.rb
	app/models/order.rb
	app/models/payment.rb
	app/views/orders/index.html.erb
	app/views/orders/show.html.erb
	app/views/payments/index.html.erb
	config/locales/translation_en.yml
	config/locales/translation_ja.yml
	config/routes.rb
mearge commit
Merge branch 'master' of github.com:MiraitSystems/enju_trunk

Conflicts:
	db/fixtures/numberings.yml
Merge branch 'issue_order' of github.com:MiraitSystems/enju_trunk into issue_order

Conflicts:
	app/controllers/orders_controller.rb
	app/models/order.rb
	app/views/orders/_form.html.erb
	app/views/orders/index.html.erb
	config/locales/translation_en.yml
	config/locales/translation_ja.yml
refs issue_order orderのカラム削除＆修正