Fix bug builder
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	ISEdesign/CreateNewWorld.Designer.cs