Addition 1 of cbir_setup/src
Merge branch 'master' of https://github.com/terentz/cbir_setup