Add sortable switch for tasks
Merge branch 'develop'