Merging with editor changes
Merge branch 'develop' of https://github.com/UWMLI/thermo-golf into develop
	Merging with recent editor changes
Updating level editor
Merge branch 'develop' of https://github.com/UWMLI/thermo-golf into develop
"Updating level editor	"