Improve map and chunk generation
Merge remote-tracking branch 'origin/master'

Conflicts:
	assets/Interface/editor.xml
	bin/Interface/editor.xml
	bin/Interface/hud.xml
	bin/voxelion/game/client/ClientApp.class
	bin/voxelion/game/client/gui/nifty/GUIState.class
	bin/voxelion/game/client/gui/nifty/Inventory.class
	bin/voxelion/game/client/gui/nifty/ItemBar.class
	bin/voxelion/game/client/gui/nifty/KeysManager.class
	bin/voxelion/game/client/gui/nifty/Pause.class
	bin/voxelion/game/client/gui/nifty/screencontrollers/ControlsScreen.class
	bin/voxelion/game/client/gui/nifty/screencontrollers/HudScreen.class
	bin/voxelion/game/client/gui/nifty/screencontrollers/MenuScreen.class
	bin/voxelion/game/client/gui/nifty/screencontrollers/OptionsScreen.class
	bin/voxelion/modder/EditorScreen$1.class
	bin/voxelion/modder/EditorScreen.class
	bin/voxelion/modder/TheObject.class