added video to accepted media inputs
Merge branch 'master' into angular-admin