Merge https://github.com/Anuken/Mindustry/pull/633 as first. This file contains @Dr4coDragon's edits with some changes. + improvements based on comparison with original bundle file.