Merge origin/master

Conflicts:
	TheGuardiansOfHellfire/src/TGH/view/InventoryMenuView.java