fMerge branch 'master' of github.com:azanegin/miptcommuna
fMerge branch 'master' of github.com:azanegin/miptcommuna

Conflicts:
	app/models.py

azanegin/miptcommuna,azanegin/miptcommuna,azanegin/miptcommuna