Started adding footer
Merge branch 'master' into thien

* master:
  Started adding footer