Bars moved
nifty/bars -> tonegod/bars
Merge branch 'master' of https://github.com/Progy-git/Minecraft-like

Conflicts:
	src/mylife/org/gui/nifty/bars/BarsManager.java
	src/mylife/org/gui/nifty/bars/ExpBar.java
	src/mylife/org/gui/nifty/bars/LifeBar.java
	src/mylife/org/gui/nifty/bars/ShieldBar.java
	src/mylife/org/gui/nifty/controllers/ControlsScreen.java
	src/mylife/org/gui/nifty/controllers/HudScreen.java
	src/mylife/org/gui/nifty/controllers/LoadingScreen.java
	src/mylife/org/gui/nifty/controllers/MenuScreen.java
	src/mylife/org/gui/nifty/controllers/OptionsScreen.java
	src/mylife/org/gui/nifty/screencontrollers/ControlsScreen.java
	src/mylife/org/gui/nifty/screencontrollers/HudScreen.java
	src/mylife/org/gui/nifty/screencontrollers/LoadingScreen.java
	src/mylife/org/gui/nifty/screencontrollers/MenuScreen.java
	src/mylife/org/gui/nifty/screencontrollers/OptionsScreen.java
	src/mylife/org/gui/tonegod/bars/BarsManager.java
	src/mylife/org/gui/tonegod/bars/ExpBar.java
	src/mylife/org/gui/tonegod/bars/LifeBar.java
	src/mylife/org/gui/tonegod/bars/ShieldBar.java
	src/voxelion/game/client/GameState.java
	src/voxelion/game/client/gui/nifty/GUIState.java
	src/voxelion/game/client/gui/nifty/KeysManager.java
	src/voxelion/game/client/gui/nifty/bars/BarsManager.java
	src/voxelion/game/client/gui/nifty/bars/ExpBar.java
	src/voxelion/game/client/gui/nifty/bars/LifeBar.java
	src/voxelion/game/client/gui/nifty/bars/ShieldBar.java
	src/voxelion/game/client/gui/nifty/controllers/ControlsScreen.java
	src/voxelion/game/client/gui/nifty/controllers/HudScreen.java
	src/voxelion/game/client/gui/nifty/controllers/LoadingScreen.java
	src/voxelion/game/client/gui/nifty/controllers/MenuScreen.java
	src/voxelion/game/client/gui/nifty/controllers/OptionsScreen.java