Merge branch 'master' of github.com:joomlajp/Joomla-in-Japanese

Conflicts:
	installation/language/ja-JP/ja-JP.ini
Merge branch 'master' of github.com:joomlajp/Joomla-in-Japanese
^ working on updating administrator ini files. still working...