Merge with branche tmp_82B17_JS 

The code in this branche mainly repairs bugs with the item/weapons-system where items and weapons would get lost while handling your inventory. Furthermore it fixes water barrels (from some of which you can now collect water). Kudos to JoSchaap.

Brings this fork to version 0.9f-sr2