Fix keylisteners in 3 tile input command
merge stuff
Merge branch 'integration' of https://github.com/nwcaldwell/Java into integration