Save inventory.
Merge remote-tracking branch 'origin/master'
Keep old inventory objects.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/censoredsoftware/demigods/engine/player/DCharacter.java