fixing bugs in inventory
Merge branch 'master' of https://github.com/Dakror/LiturfaliarCest.git

Conflicts:
	Liturfaliar Cest/.classpath