Fixed map problems
Merge branch 'master' of https://github.com/tpepels/graphslam2
compiling
Merge branch 'master' of https://github.com/tpepels/graphslam2

Conflicts:
	src/scanmatcher.cpp
	src/scanmatcher.h