Merge branch 'devel' of https://github.com/sorflex/CVAC into sorflex-devel
minor patches after merge
Tom was right: CMAKE_LIBRARY_OUTPUT_DIRECTORY is not always set
Merge branch 'devel' of https://github.com/NPSVisionLab/CVAC into devel