family behavior changed to m2m
Merge branch 'master' of https://github.com/gasinvein/django-municipality

Conflicts:
	admin.py
	models.py