Improve templates some more
Merge branch 'master' of https://github.com/joelhaasnoot/better-django-helpdesk