Items and weapons
Merge branch 'items'

Conflicts:
	core/src/com/mousesvscats/game/GameLogic/Cat.java
	core/src/com/mousesvscats/game/GameLogic/GameClass.java
	core/src/com/mousesvscats/game/GameMousesVSCats.java
	desktop/src/com/mousesvscats/game/desktop/DesktopLauncher.java
Merged with items
Merge remote-tracking branch 'origin/master'

Conflicts:
	core/src/com/mousesvscats/game/GameLogic/Labyrinth.java
	core/src/com/mousesvscats/game/GameMousesVSCats.java