Fix Russian translation. Исправления в русском переводе
Fix translation for ja
Fix typo in admin locale file
Change wording translation for ja
Fix typo in admin ja locale
Merge pull request #1160 from tyabe/fix_admin_locale

Fix admin locale file
FIX: env-shebang typo in padrino-performance.gemspec
Merge pull request #1162 from lenzcom/master

FIX: env-shebang typo in padrino-performance.gemspec
Merge branch 'master' into admin-tweaks-pre-release

Conflicts:
	padrino-admin/lib/padrino-admin/locale/admin/ja.yml
	padrino-admin/lib/padrino-admin/locale/admin/ru.yml