Merge pull request #25 from mikedehaan/master

Upgraded antlr-java-parser to support OSGi and comments