Merge pull request #96 from Schachus/master

irgendwie hatte ich die eine gelöschte Zeile eben vergessen mit zu comitten, oder git hat es nicht gemacht, daher nochmal
Hotfixed #95
Merge branch 'master' of https://github.com/26thmeusoc/adventure-of-umalu
Merge branch 'master' of https://github.com/Schachus/adventure-of-umalu into Schachus-master

Conflicts:
	src/rogue/creature/util/Inventory.java
Added Backgroundstories to some weapons
Added some Actiontext to Eventlines
Added Helplines
Removed vim-like Controls
Set x to move south
Set 'h' as new History Key
Fixed Bug, that bonus HP/Strength weren't updated, when a sword is destroyed
Merge remote-tracking branch 'upstream/master'