Merge branch 'master' of github.com:dsprenkels/kn-next into daan-django

Conflicts:
	website/templates/base.html
Port to django for 1769f9d2