Refactor routes.rb
Rails 4.0 tutorial style
Use match 'hoge', to: 'foo#bar', via: 'fuga'
Merge branch 'master' into refactor_kanpe

Conflicts:
	config/routes.rb

Fix Conflicts