Re-added keyboard, fixed startup on Keynote
Merge branch 'master' of https://github.com/unifiedremote/sandbox

Conflicts:
	Main/File Manager/settings.prop
	Main/Monitor/remote_osx.lua
Merge