Merge branch 'lars/5.6.3-facelift' into lars/5.6.4-facelift

Conflicts:
	ietf/doc/templatetags/ietf_filters.py
	ietf/doc/views_charter.py
	ietf/templates/doc/charter/edit_notify.html
	ietf/templates/doc/charter/edit_telechat_date.html
	ietf/templates/doc/document_ballot_content.html
	ietf/templates/doc/document_history.html
	ietf/templates/doc/edit_notify.html
	ietf/templates/doc/edit_telechat_date.html
	ietf/templates/doc/notify.html
	ietf/templates/group/concluded_groups.html

git-svn-id: http://svn.tools.ietf.org/svn/tools/ietfdb/personal/lars/5.6.4-facelift@8429 7b24d068-2d4e-4fce-9bd7-cbd2762980b0