Merge origin/master

Conflicts:
	src/svugame/engine/state/States.java
Merge origin/master

Conflicts:
	src/svugame/model/items/Inventory.java