Fix typo
Merge pull request #489 from kenjis/patch-1

Fix typo
Merge branch '1.5/develop' into 1.5/develop_japanese

Conflicts:
	classes/database/introduction.html
Merge pull request #101 from kenjis/1.5/develop_japanese

Merge branch '1.5/develop' into 1.5/develop_japanese