Merge branch 'master' of https://github.com/hskww/hotkey

Conflicts:
	webhotkeyDemo.html
Merge branch 'master' of https://github.com/hskww/hotkey