Fix order of movements

The movement list was being returned in order of id, make it
alphabetical.
Make sure list of artwork types is alphabetical
Merge branch 'fix-movement-list-order' into develop