refs #1544 テスト
Merge branch 'akouryy_ja'

Conflicts:
	lib_ja.php
Merge branch 'master' of https://github.com/akouryy/hawaii