RB: merge script for renaming antlr and natty packages
Regeneration of renamed packages from patched-grammar'
idea/misc.xml gitignore
merging the mergetool
removing unused tests