Place hotkeys in correct position
Merge pull request #582 from igorko/master

Place hotkeys in correct position
Merge remote-tracking branch 'upstream/master' into minions