refs #1528
fix syntax error
Erase some words
Merge branch 'akouryy_ja'

Conflicts:
	lib_ja.php
Merge branch 'master' of https://github.com/akouryy/hawaii
refs #1544
Or -> mOr