Merge branch 'footer'

q