Tiny edits, not important
Merge branch 'master' of https://github.com/csvoss/carbonate
Merge branch 'master' of https://github.com/csvoss/carbonate
Merge branch 'master' of https://github.com/csvoss/carbonate

Conflicts:
	orgo_django/app/admin.py