media policy
merge with ve-sprint-9
changes from code review
Merge branch 've-sprint-9' into VE-117
Merge pull request #2458 from Wikia/VE-117

VE-117: Media policy