it appears to work now
Merge branch 'master' of https://github.com/AIRLab-POLIMI/C-SLAM

Conflicts:
	c_slam_roamfree/src/TracksHandler.cpp

Yuppieeeee