Merge branch 'master' of https://github.com/klubmmam/kmm_release

Conflicts:
	kmm_release/settings.py
	kmm_release/urls.py