Fix ilwhack header buttons
[ilwhack] Only display teams with a project
Cleanup
Merge branch 'master' of https://github.com/compsoc-edinburgh/website-django

Conflicts:
	compsoc/templates/compsoc/base.html
	compsoc/views.py