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
Merge branch 'feature-updateicecv' of https://github.com/NPSVisionLab/CVAC into feature-updateicecv
mathias fix for easy.deleteAllFiles and fix for fileserver "data" dir problem
added .jpeg to file types to support