Updated to new version of models.
Merge branch 'master' of github.com:gtalent/wombat-editor

Conflicts:
	spritesheeteditor.cpp
	spritesheeteditor.ui