Script testing and ServiceManager changes
new training data from K
changed permissions back to execute
Remove CRLF's
Replacing CRLF with LF
removing these files
Merge pull request #22 from sorflex/devel

Testing, Standardized LF
test BOW only when built. Find UnitTest++ on *nix.
added java code for LableMe from MediaAnalyst
Merge branch 'master' of https://github.com/NPSVisionLab/CVAC into corpus

Conflicts:
	CMakeLists.txt
	CMakeModules/FindIce.cmake
	CMakeModules/FindUnitTest++.cmake
	CMakeModules/ice_common.cmake
	src/cvac/corpus/LabelableListI.java
	test/UnitTests/CMakeLists.txt
processLabels change and phyton changes
Merge branch 'corpus' of https://github.com/NPSVisionLab/CVAC into corpus

Conflicts:
	test/UnitTests/python/CorpusServerTest.py
working on labelme
line feed issue
initial check of labelme change for Jon, they are not finished
Merge branch 'corpus' of https://github.com/NPSVisionLab/CVAC into corpus
From Tom's fork (sorflex)

Merge branch 'corpus' of https://github.com/sorflex/CVAC into corpus

Conflicts:
	test/UnitTests/python/CorpusServerTest.py
Unit Test refactor of CommonDataSet cont.

All 3 major test-methods accessed through the new 'CommonDataSetTestAccess.java' class.