Cleaned up battle service a lil bit
Added rebuilt JSON.jar which requires Java 6, not 7