Add replacement for the markdown filter (removed in Django 1.6)
Merge branch 'update_django'

Conflicts:
	forum/templatetags/extra_filters.py