Segments: Classes Added (no implementation yet)
Merge remote-tracking branch 'HomagePrototypeRepo/master'
Resolving merge
Moving MediaPlayer under the Framework group