Changes for python to use lib/python and paths
Merge branch 'devel' of https://github.com/NPSVisionLab/CVAC into devel
Fixed path problem with FileServerTest andded paths.py.in
data fix for FileServerTest.py
fixing data path
Merge branch 'devel' of https://github.com/sorflex/CVAC into devel
python paths changes
Merge branch 'devel' of https://github.com/NPSVisionLab/CVAC into devel

Conflicts:
	test/UnitTests/python/FileServerTest.py
fixed temp file delete
Merge branch 'devel' of https://github.com/sorflex/CVAC into sorflex-devel
minor patches after merge