Merge branch 'develop'

src/main/java/org/sablecc/sablecc/ComputeInlining.java

...n/java/org/sablecc/sablecc/ComputeSimpleTermPosition.java

src/main/java/org/sablecc/sablecc/ConflictException.java

src/main/java/org/sablecc/sablecc/ConstructNFA.java

...a/org/sablecc/sablecc/ConstructParserGenerationDatas.java

src/main/java/org/sablecc/sablecc/ConstructProdsMap.java

src/main/java/org/sablecc/sablecc/DFA.java

src/main/java/org/sablecc/sablecc/DisplayLicense.java

src/main/java/org/sablecc/sablecc/GenAlts.java

src/main/java/org/sablecc/sablecc/GenAnalyses.java

src/main/java/org/sablecc/sablecc/GenLexer.java

src/main/java/org/sablecc/sablecc/GenParser.java

src/main/java/org/sablecc/sablecc/GenProds.java

src/main/java/org/sablecc/sablecc/GenTokens.java

src/main/java/org/sablecc/sablecc/GenUtils.java

...org/sablecc/sablecc/GenerateAlternativeCodeForParser.java

src/main/java/org/sablecc/sablecc/Grammar.java

src/main/java/org/sablecc/sablecc/In_Production.java

src/main/java/org/sablecc/sablecc/Inlining.java

src/main/java/org/sablecc/sablecc/IntSet.java