removed extra adapter deactivate
Merge branch 'feature-occluded' of https://github.com/NPSVisionLab/CVAC into feature-occluded
automatically updated version patch number
Merge commit '632c6fe2909dbc30bb467dbd1c525a7ce0d7237e' into devel
automatically updated version patch number
Merge commit '7b92ac24614913d324799bfb3844ccbc4a0ab5bd' into devel
automatically updated version patch number
automatically updated version patch number
Merge pull request #108 from lekomin/feature-occluded

Update easy.py for generating ROC
Merge commit '5c36cd244ffb5d1dc0be2b474372b60083c971e5' into devel
automatically updated version patch number
Fixed problem of not starting the python file and corpus services because include directive got moved
automatically updated version patch number
Merge branch 'feature-occluded' of https://github.com/NPSVisionLab/CVAC into feature-occluded
changed osx startup to a shell script that finds best python to run
Merge commit 'e2d2ebf34c41d54df7d26de28037d7f64b108003' into devel
automatically updated version patch number
automatically updated version patch number
added setting up python alias for osx terminal in gui.py and changed not
passing -p python to startup.py
fixed python version issue by opening the range of python versions accepted