changing footer
Merge branch 'master' into 2-panel

* master:
  changing footer