Remove duplicated lines in Scanner.ih
Merge branch 'master' of https://github.com/nathanprat/tlp-gp

Conflicts:
	parserc++/scanner/Scanner.ih