Merge remote-tracking branch 'origin/devel' into...

Merge remote-tracking branch 'origin/devel' into 191-emplace-api-inconsistent-with-processortrackerfeature-landmark-functions

Conflicts:
	include/core/processor/track_matrix.h
	src/processor/processor_tracker.cpp
	src/processor/track_matrix.cpp
	src/sensor/sensor_base.cpp
	test/gtest_track_matrix.cpp