More cleanups and addition of links at bottom of page.
Merge remote-tracking branch 'origin/master'

Conflicts:
	web/views.py
Fixing tabs