Merge remote-tracking branch 'origin/master'

Conflicts:
	pmm_is2/apps/adm/forms.py
	pmm_is2/apps/adm/models.py
	pmm_is2/apps/adm/views.py