fixed bug in build.xml
Merge branch 'paddatrapper-master'
Merge branch 'master' of github.com:Progether/JAdventure
Merge remote-tracking branch 'upstream/master'