i18nのjsへの変換
Merge branch 'master' of github.com:kuntao/taskeyOnRails

Conflicts:
	app/assets/javascripts/i18n/translations.js