comments link
comments link
Merge branch 'master' into comment

Conflicts:
	wsgiwars/views.py