UI-789: Add 'weight' parameter to sort toolbar's sub-options
UI-789: Restructure template and options' object to add the ability to sort them, add ante & post keys
Merge branch 'UI-789'