Fixed wordform model
Merge remote-tracking branch 'origin/addword_template' into addword_template

Conflicts:
	wordengine/models.py