Added win32 key and button support
Merge remote-tracking branch 'origin/win32' into linux