fixing a texture bug

modified:   src/entity/npc/LivingEntityManager.java
modified:   src/entity/player/Player.java
modified:   src/item/weapon/LaserRifle.java
modified:   src/userInterface/Inventory.java
better and cleaner handling of the inventory using the factorized code

modified:   src/entity/player/Player.java
modified:   src/userInterface/Inventory.java
Merge branch 'master' into inventory

Conflicts:
	src/userInterface/Inventory.java