catkinization on progress

Conflicts:

	lsd_slam_core/CMakeLists.txt