fafa
Merge branch 'master' of https://github.com/tpepels/graphslam2

Conflicts:
	lib/libgraph.so
	lib/libscanmatcher.so