Merge branch 'working-branch-alpha4' of https://github.com/sgrastar/RimWorld-ja into working-branch-alpha4

Conflicts:
Keyed/Alerts.xml
Keyed/Misc.xml
test