Merge remote-tracking branch 'upstream/master'
Do not call memset multiple times - minor speedup improvement
.gitignore fixes in tests directory
Fix invalid charPositionInLine reported for the 1s line tokens

Reported here:
http://antlr.markmail.org/search/?q=Jim%20Idle#query:Jim%20Idle%20from%20list%3Aorg.antlr.antlr-interest%20from%3A%22Jim%20Idle%22+page:83+mid:rnvmkdec65rddzua+state:results
Fix ST compile warning - Java target used as an example
Fix member variables init
Better error reporting from Lexer
Fix for -trace option
Store token position in Lexer label refs
emitNew renamed to emit

- also fixed(calls set_token)
Memory leak test case
Fix some memory leaks in test cases
Lexer grammar using synpreds
Fix order of evaluating conditions having synpreds in them

- significant performance improvement
Merge remote-tracking branch 'upstream/master'
Switch order of conjunction evaluation

- significant performance improvement
Merge remote-tracking branch 'upstream/master'
Merge pull request #132 from mike-lischke/master

C Target: mem leak and merge conflict fixes
Merge pull request #129 from ibre5041/master

C++ target fixes and improvements
Fix #151; Java 7 -> 8 compatibility.