Add footer
Update footer
Merge branch 'refs/heads/master' into gh-pages

Conflicts:
	admin.html