finished footer edit and delete
'add'
Merge branch '13081203' into master-testing