Shut some warnings up
Deobf jar needs manifest too
Merge branch 'develop'