equipped items never removed from inventory
Make combat work again.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	areas/midgaard.json
	src/character.js
	src/commands.js