Adding media_dir
Merging update from master
Merge branch 'master' into create_media_dir

Important update in master
Merge branch 'master' into create_media_dir

Correcting wrong cut
Correcting wrong cut for media_dir
Correcting wrong grep for media_dir