ADD: generate model diagram
Merge remote-tracking branch 'origin/master'

Conflicts:
	Koalition/settings.py