Switched back to desktop mode; Bug fixes and start of inventory
Merge branch 'master' of https://github.com/Kyrai/The-Labyrinth

Conflicts:
	The Labyrinth/.metadata/.log
	The
Labyrinth/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.e
clipse.core.resources
	The Labyrinth/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	The
Labyrinth/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xm
l
	The Labyrinth/src/com/gmail/kyraiesd/labyrinth/Game/StateDataGame.java
	The Labyrinth/src/com/gmail/kyraiesd/labyrinth/Game/StateGame.java
	The
Labyrinth/src/com/gmail/kyraiesd/labyrinth/Libraries/World/Chunk.java
	The
Labyrinth/src/com/gmail/kyraiesd/labyrinth/Libraries/World/MazeLoader.ja
va
	The
Labyrinth/src/com/gmail/kyraiesd/labyrinth/Libraries/World/Sector.java
	The
Labyrinth/src/com/gmail/kyraiesd/labyrinth/MazeGen/BranchGenerator/MazeG
eneratorBranch.java
	The
Labyrinth/src/com/gmail/kyraiesd/labyrinth/MazeGen/Cells/GeneratorStateI
nitCells.java
	The
Labyrinth/src/com/gmail/kyraiesd/labyrinth/MazeGen/Cells/GeneratorStateM
apPassages.java
	The
Labyrinth/src/com/gmail/kyraiesd/labyrinth/MazeGen/GeneratorState.java
	The
Labyrinth/src/com/gmail/kyraiesd/labyrinth/MazeGen/GeneratorStateSave.ja
va
	The
Labyrinth/src/com/gmail/kyraiesd/labyrinth/MazeGen/GeneratorStateWaiting
.java
	The
Labyrinth/src/com/gmail/kyraiesd/labyrinth/MazeGen/GuiGeneratorProgress.
java
	The
Labyrinth/src/com/gmail/kyraiesd/labyrinth/Menu/MazeSetupGUI/GuiEventHan
dlerGenerate.java
	The
Labyrinth/src/com/gmail/kyraiesd/labyrinth/Menu/MazeSetupGUI/GuiEventHan
dlerMazeAlgorithm.java
	The
Labyrinth/src/com/gmail/kyraiesd/labyrinth/Menu/MazeSetupGUI/GuiEventHan
dlerMazeSize.java
	The
Labyrinth/src/com/gmail/kyraiesd/labyrinth/Menu/MazeSetupGUI/GuiGenMaze.
java
	The
Labyrinth/src/com/gmail/kyraiesd/labyrinth/Menu/MazeSetupGUI/GuiNameMaze
.java
	The
Labyrinth/src/com/gmail/kyraiesd/labyrinth/Menu/MenuGUI/GuiEventHandlerM
azeSetup.java
	The
Labyrinth/src/com/gmail/kyraiesd/labyrinth/Menu/MenuGUI/GuiMenu.java