Add some docstrings.
Merge remote-tracking branch 'origin/master'

* origin/master:
  Add some docstrings.

Conflicts:
	kotti/views/util.py