updated the gradle build script so 'build gradle' generates a jar which can actually be used
Merge commit from stuff