somethings screwy with concurrency, merging to rollback
Merge branch 'master' of https://github.com/jjacobskind/settlers into HEAD
Merge pull request #84 from jjacobskind/event-listener-bugfix

Event listener bugfix