keep it quite
Merge branch 'devel' of https://github.com/NPSVisionLab/CVAC

Conflicts:
	include/version.h
merge
NULL pointer and tempnam fixes
Update easy/corpus_service.py and easy/CMakeLists.txt for VideoCorpus of SBD
Update videosegment.py according to the updated video corpus
Merge branch 'master' of https://github.com/NPSVisionLab/CVAC
fixed up gui.py to work with windows and improved look
Added start menu item for gui.py
Merge branch 'feature-occluded' of https://github.com/NPSVisionLab/CVAC into feature-occluded
fixed dependency issue with slice files
fixed issue with slice dependency
install script changes for OSX installing python and numpy
fixed dependency problem in windows 8
still working on windows 8 build problems
Merge commit 'ffa6b7e92a7ba2a61c079d5557af89edb2667ec4' into HEAD
automatically updated version patch number
changes for osx packaging
Merge commit 'c1ed9a601cd709778a576086da7c18df0566e909' into HEAD
automatically updated version patch number