.jar file stuff
Merge remote-tracking branch 'origin/master' into BranDev-Branch