commit 9
Merge branch 'master' of github.com:idlweb/openordini
create migrations for new models
Merge branch 'master' into fs-dev

Conflicts:
	openordini/openordini/settings.py