debugging merge stuff for line aligner
Merge branch 'master' of https://github.com/grisetti/g2o_frontend