Selection and saving work, loading doesn't.
Merge pull request #824 from protherj/media-service-test

Selection and saving work, loading doesn't.
Merge pull request #825 from rustyswayne/1.4.0-lists

#M-374 Fixed
Merge remote-tracking branch 'merchello/1.4.0' into 1.4.0-lists
Merge remote-tracking branch 'merchello/1.4.0-lists' into 1.4.0-lists