Added sort_order for buttonset
Resolving merge conflicts
Oh git, you git
Merge remote-tracking branch 'upstream/master' into 685_order_sets
I hope you're happy now
Merge pull request #1205 from AdmiralJota/685_order_sets

Added sort_order for buttonset