Final commit before merge

Merging without-xm and master branch after this.
Removed javamod.jar