Keep the web/media directory
Fixed PIM-1285
Merge branch 'master' into update_bap_beta