Linux Ice.py location, error message
checking in temp stuff
changed ServiceMan to use startServices.bat instead of startIceBox.bat and fixed startServices to use lockfile
Merge branch 'devel' of https://github.com/NPSVisionLab/CVAC into devel
Set building RSI build default to OFF since it needs DetectorData
The file version.h.repo is too much of a pain, it messes up jenkins automatic merges so ignoring it
adding include/version.h.repo to ignore for this branch
Merge branch 'devel' of https://github.com/NPSVisionLab/CVAC into feature-newice

Conflicts:
	etc/CMakeLists.txt
	include/version.h.repo
integrating RSI into CascadeDetector
added testfile
changed to not using add_jar for vs 2008
don't add 'd' at end of icebox command if not debug build
Merge commit 'a05c03be0aa10fdb47f11ccf67a8dc19120d37c1' into HEAD
undoing accidental merge of feature-rsi branch
bash script to start services, run ctest, stop services
Merge branch 'feature-rsi' of https://github.com/NPSVisionLab/CVAC into feature-rsi
Removed paths as not needed anymore
Merge commit '425d73d6bf6c62b4d303904f555e3ab789343f6f' into HEAD
add RSI-related routines to detectorService of opencv_cascade
In the detectorService of opencv_cascade, RSI-related variables are changed to local variables.