Media Admin Fixes
Merge branch 'master' of git://github.com/networking/init-cms-bundle