Inventory upgraded
update
Merge branch 'Inventory' into bs&world

Conflicts:
	bin/com/me/rvbgame/RvBBase.class
	bin/com/me/rvbgame/RvBCurrentUnit.class
	bin/com/me/rvbgame/RvBPlayer$1.class
	bin/com/me/rvbgame/RvBPlayer$2.class
	bin/com/me/rvbgame/RvBPlayer$3.class
	bin/com/me/rvbgame/RvBPlayer$4.class
	bin/com/me/rvbgame/RvBPlayer$5.class
	bin/com/me/rvbgame/RvBPlayer$6.class
	bin/com/me/rvbgame/RvBPlayer$7.class
	bin/com/me/rvbgame/RvBPlayer.class
	bin/com/me/rvbgame/RvBTower.class
	bin/com/me/rvbgame/RvBUnit$1.class
	bin/com/me/rvbgame/RvBUnit.class
	bin/com/me/rvbgame/RvBWorld$1.class
	bin/com/me/rvbgame/RvBWorld$2.class
	bin/com/me/rvbgame/RvBWorld.class
	bin/com/me/rvbgame/RvbGdxGame.class
	bin/com/me/rvbgame/units/UnitDefender.class
	bin/com/me/rvbgame/units/UnitMelee.class
	bin/com/me/rvbgame/units/UnitRanged.class
	bin/com/me/rvbgame/units/UnitRangedMass.class
	bin/com/me/rvbgame/units/UnitSpecialStan.class
	src/com/me/rvbgame/screens/BattleScreen.java
	src/com/me/rvbgame/screens/GameScreen.java
	src/com/me/rvbgame/screens/SPSettingsScreen.java
	src/com/me/rvbgame/screens/SplashScreen.java
	src/com/me/rvbgame/units/UnitDefender.java
	src/com/me/rvbgame/units/UnitMelee.java
	src/com/me/rvbgame/units/UnitRanged.java
	src/com/me/rvbgame/units/UnitRangedMass.java
	src/com/me/rvbgame/units/UnitSpecialStan.java