integrated the media object
Merge branch 'master' of https://github.com/PhoenixRockit/team_avnet
Merge branch 'master' of https://github.com/PhoenixRockit/team_avnet