Merge branch 't5_form' into t6_widget

Conflicts:
	contact/contact/RequestLogMiddleware.py
	contact/contact/forms.py
	contact/contact/helper.py
	contact/contact/templatetags/contact_filters.py
	contact/contact/tests.py