fixed bug
Merge branch 'single_term' of github.com:rkonow/surf into single_term

Conflicts:
	include/surf/idx_nn.hpp