Merge pull request #13 from TAMED/staging

Changed version of jbox2d
map is now created out of lines instead of blocks, to prevent getting caught