fix for Japanize
Merge branch 'akazah'

Conflicts:
	oubo.php