we should be able to order these via the position field
Merge branch 'develop' into asset-deletion
Merge remote-tracking branch 'origin/asset-deletion' into asset-deletion