commit
Merge branch 'master' of https://github.com/svpmtrust/chitmanager.git

Conflicts:
	src/chit_main_app/views.py
	src/chits/urls.py