update
Merge branch 'dev' of https://github.com/sabov/hotkey-ninja into dev