Merge pull request #201 from csoroiu/master

added failonerror and fork to build files and a small fix for the javagenerator
Merge pull request #202 from csoroiu/master

Build file changes