Added keyboard to windows, might work on linux but android enums are old, need to be copied from windows
Merge remote-tracking branch 'origin/develop' into develop