Allow to re-order shortcuts in any group
Merge branch 'sapns__shortcuts_order' into master2