Bugfix etc.
Merge branch 'master' of https://github.com/chte/MiniJavac
Merging

Merge branch 'master' of https://github.com/chte/MiniJavac
Few name changes to be more coherent with grammars
Merge branch 'master' of https://github.com/chte/MiniJavac