Merge pull request #4 from vongosling/master

Cleanup of pom.xml and java-gen directory.
Merge pull request #1 from xedin/master

Merge pull request #4 from vongosling/master