Linux Ice.py location, error message
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.
Merge pull request #88 from lekomin/feature-rsi

RunSet wrapper and iterator used in cascade detector
changed so if windows can't symbolic link due to permissions (admin) then copy file
fix for sym link windows fix
script to start services for jenkins when running ctest
Merge branch 'feature-rsi' of https://github.com/NPSVisionLab/CVAC into feature-newice

Conflicts:
	algorithms/opencv_cascade/detectorService/CascadeDetectI.cpp
Fixed bad conflict resolution when I merged feature-newice with feature-ice
Update RSI-related things for displaying frame information and original file information
Merge pull request #89 from lekomin/feature-rsi

Update RSI-related things for displaying frame information and original file information
resolved conflict that was none
Merge pull request #90 from lekomin/feature-rsi

Feature rsi
added TrainerProperties to cascade trainer and changed opencv cv2 lib to be a cmake variable and look in opencv lib directory for it.
fixes for windows and cv2
finished detector properties
fix for cv2.so search