Merge branch 'master' into gh-pages
Links footer
Fix footer
Fix footer
Merge branch 'gh-pages'