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
automatically updated version patch number
Merge branch 'feature-updateicecv' of https://github.com/NPSVisionLab/CVAC
Merge commit 'a496020cee27cdc51262ab74300613dddd96687b' into devel
automatically updated version patch number
Merge commit 'f17971a6e5a88b6eaed73796d428dd4fe4fd79c2' into devel
automatically updated version patch number