Moved bulk of new Sports into separate file.
Moved new music schema to separate file.
Reverting to conflict-free master version.
Merge branch 'sdo-sports' into sdo-meltingpot
Merge branch 'sdo-music' into sdo-meltingpot