Modify to use ANTLR 3.4 instead of 3.5
Merge upstream/master and resolve merge conflicts (pom.xml and version.cmake - version numbers)
Merge pull request #123 from mjkrumlauf/master

Modify to use ANTLR 3.4 instead of 3.5