Remove inadvertantly checked in artifacts of merge conflict resolution
Merge pull request #487 from rcordovano/japanese_localization

Remove inadvertantly checked in artifacts of merge conflict resolution