updated mergeScript so that it also merges Media
merged annex60 media into IDEAS
Merge branch 'Annex60' into issue137_importAnnex60
updated default media to new Annex60 media
Merge pull request #150 from open-ideas/issue137_importAnnex60

New/experimental media merged from Annex60