Not sure where these changes came from
Merge branch 'master' of https://github.com/NPSVisionLab/CVAC
keep it quite
Merge branch 'devel' of https://github.com/NPSVisionLab/CVAC

Conflicts:
	include/version.h
merge
Merge branch 'devel' of https://github.com/sorflex/CVAC
Merge branch 'devel' of https://github.com/NPSVisionLab/CVAC
Merge branch 'devel' of https://github.com/NPSVisionLab/CVAC
Merge branch 'master' of https://github.com/NPSVisionLab/CVAC
python only client needs 3rdparty\ice\python
Merge branch 'devel' of https://github.com/NPSVisionLab/CVAC
dependency fixes for windows 8
Merge branch 'master' of https://github.com/NPSVisionLab/CVAC
Merge branch 'devel' of https://github.com/NPSVisionLab/CVAC
Merge branch 'feature-updateicecv' of https://github.com/NPSVisionLab/CVAC
added new training prop to use existing info file instead of building it from the run set
debug for the error: exceptions.ValueError: invalid value for ::cvac::VideoSeekTime member `time'
fixed c_str issue
Update Evaluate.py for ROC
Merge pull request #110 from lekomin/feature-updateicecv

debug for the error: exceptions.ValueError: invalid value for ::cvac::Vi...