edit media-add page and footers
Merge remote-tracking branch 'origin/master'