Added support for Hotkey
Merge remote-tracking branch 'oe-a/master'

* oe-a/master:
  Added support for Hotkey

Conflicts:
	skin_default.xml