Merge branch 'dev'
Merge branch 'dev'
Updated Japanese locale
Merge pull request #6 from Haebaru/master

Updated Japanese locale
Merge branch 'master' into dev