conflict in template_tags.py solved. I don't know why this could not be merged automatically
Merge branch 'master' of https://github.com/comic/comic-django