more editor gui fixes
Merge branch 'master' of github.com:marykw/RBOR

Conflicts:
	world.cpp
	world.h