Merge branch 'develop_matching_kernels' into develop_2.0_test

Conflicts:
	src/software/SfM/main_ComputeMatches.cpp