Update Windows' keyboard input in preparation for eventual key remapping. Might need a bit more work, but for now, all keyboard functionality should be restored.
Merge pull request #2613 from thedax/updateWinKeyboardToKeyMapping

Update Windows' keyboard input in preparation for eventual key remapping
Update native
Fix wrong thread id when resuming after interrupt.

Who knows what kind of havoc this was causing.
Merge pull request #2614 from unknownbrackets/scheduling

Fix wrong thread id when resuming after interrupt.
Merge remote-tracking branch 'upstream/master' into fps2

Conflicts:
	native