import and model fixes
misc fixes
Merge branch 'master' of github.com:openstate/parlis-database

Conflicts:
	core/models.py