Merge pull request #11 from andi-bigswitch/master

work-in-progress-Commit of the java generator