Merge branch 't5_edit' into t6_widget

Conflicts:
	apps/about/tests.py
ticket:6 fix ajax
ticket:6 fix templates
Merge branch 't6_widget' into t8_tag

Conflicts:
	apps/about/tests.py
	apps/about/views.py
	templates/about/about_list.html