support CP932 and test.
Resolve merge conflicts
Add back changes I accidentally killed off when merging.
Normalize line endings.
Restore versions of test files from develop branch. Meld butchered the encodings when I was merging things.
Fix permission on CP932 directory
Update CP932 check to use first_char instead of aBuf[0]
Remove y-moto-com.xml from SHIFT_JIS test folder, since it's really CP932.
Merge branch 'feature/add_cp932' into develop