Better handling of shortcuts
Refactor associated to changing ShortcutsMap
Added desktop shortcuts
Merge pull request #519 from anserran/shortcuts

Better handling of shortcuts