スプリント１レビューにむけての微調整
Merge branch 'master' of https://github.com/sankai/r2 into sankai-master

Conflicts:
	config/application.rb
	config/locales/ja.yml
ja.ymlをUTF-8で再保存