Replaced 'Melange' with site_name where appropriate Also fixed EOL damage in django templates. Patch by: Sverre Rabbelier

from django.dispatch import Signal

template_rendered = Signal(providing_args=["template", "context"])