do not write version.h.repo file unless devel branch
Mathias fixed warning problem
Merge branch 'devel' of https://github.com/NPSVisionLab/CVAC into feature-labelname

Conflicts:
	include/version.h.repo
	src/easy/easy.py
	src/util/FileUtils.cpp
fixed merge problem
converted Cvacbridge to new output format and fixed some other issues
Merge branch 'feature-labelname' of https://github.com/NPSVisionLab/CVAC into devel

Conflicts:
	src/util/ServiceInvocation.cpp
changed bow detector files to new format and misc fixes
Fixed bug with getDetectorProperties for cascade detector
Merge branch 'devel' of https://github.com/NPSVisionLab/CVAC into devel

Conflicts:
	CMakeLists.txt
	include/version.h
fixed strdup problem
bootstrapping test now does not create any numbered directories in the sortInfoFolders easy function so this test now fails.  Need to fix test for new bow output
fixed issue with __init__.py copy
easy.train parameter cleanup