media-add refactor (from addtestpop) and media-capture refactor (from addmedia) initial push
Merge remote-tracking branch 'origin/master'