Update playlist & collection models to use sort order

server/models/Collection.js

@@ -10,7 +10,8 @@ module.exports = (sequelize) => {
         include: {
           model: sequelize.models.book,
           include: sequelize.models.libraryItem
-        }
+        },
+        order: [[sequelize.models.book, sequelize.models.collectionBook, 'order', 'ASC']]
       })
       return collections.map(c => this.getOldCollection(c))
     }

server/models/Playlist.js

@@ -22,7 +22,8 @@ module.exports = (sequelize) => {
               }
             }
           ]
-        }
+        },
+        order: [['playlistMediaItems', 'order', 'ASC']]
       })
       return playlists.map(p => this.getOldPlaylist(p))
     }