existing media moved to media controller
Merge branch 'v7.1' of git://github.com/phpwax/wildfire into v7.1