AndroidGenerator extends JavaGenerator now
Merge branch 'master' of github.com:TheIntegrals/GOOL