seems to be working, but some entries are entered multiple times in xml.  doesn't seem to effect models in any way
Merge remote-tracking branch 'origin/master' into untested

Conflicts:
	model.py