[Magic-HD/Light] Combined into one package.
Merge remote-tracking branch 'origin/master'
[Magic-HD] Code cleanup; added OnDemandPlayer