[Merge] lp:~phablet-team/media-hub/media-hub-desktop into lp:media-hub

[Jim Hodapp]

The proposal to merge lp:~phablet-team/media-hub/media-hub-desktop into lp:media-hub has been updated.

Commit Message changed to:

Make media-hub work on the desktop. Everything except for video playback works with this commit.

For more details, see:
https://code.launchpad.net/~phablet-team/media-hub/media-hub-desktop/+merge/302712
-- 
Your team Ubuntu Phablet Team is requested to review the proposed merge of lp:~phablet-team/media-hub/media-hub-desktop into lp:media-hub.