dropping register from the flex scanner
Merge branch 'master' of github.com:RainerKuemmerle/g2o

Conflicts:
	.travis.yml