More editor work
Merge branch 'master' of https://github.com/JeffM2501/StarshipSimEngine

Conflicts:
	EntityBuilder/EntityBuilder/MainForm.resx