changing footer
Merge branch 'master' into 2-button

* master:
  changing footer