Progether/JAdventure — pull request #213 by paddatrapper (2014-12-31 21:45:17+00:00)
Title: Fixes merge conflicts with pull request #182

I'd like someone to review this so as to ensure that there are no unexpected bugs arising from the changes. Also @verhagen could you have a look and check that I haven't removed any of your intended changes while I was fixing the conflicts