respect the drag & drop ordering of stuff in Snappy
Merge branch 'develop' into feature/respect-ordering
Merge branch 'feature/respect-ordering' into develop