Fixed variable scope for OpenMP section.
Merge branch 'feat/omp-speedups' into develop

Conflicts:
	src/chowliutree.cpp
	src/fabmap.cpp