Merge branch 'master' into feature-media-uploading
Merge branch 'master' into feature-media-uploading
added MediaItem scaffold
updated schema
Merge branch 'feature-media-uploading'