Minor bugfixes in views.
Merge branch 'master' of https://github.com/csvoss/carbonate

Conflicts:
	orgo_django/api/views.py
Minor bugfixes in views, part II