Merge branch 'master' of github.com:gtalent/wombat-editor

Conflicts:
	wombat/world/module.json
	wombat/world/qml/tileeditor.qml