Fix hotkey docs
Merge pull request #306 from jhgg/master

Fix hotkey docs
Fix battery watcher
Merge pull request #312 from jhgg/battery-watcher-fix

Fix battery watcher
Beginning work on 1.1 on the "next" branch.
Dock icon setting is restored when closing license window; fixes #311.