Merge pull request #486 from rcordovano/japanese_localization

Merge pull request conflict resolution
Remove inadvertantly checked in artifacts of merge conflict resolution