Saving inventory and world on shutdown
Merge commit '7a3a24d3f1f466af6074049dc832527a94b2c964' into develop