Bugfix for a couple of stuff. Should hv tested with ant test.
Merge branch 'master' of https://github.com/Open-Horizons/roguelike-game-development