Merge pull request #41 from sorflex/devel

Added java flags -source 1.6 -target 1.6
changed policy from old to new
Merge branch 'devel' of https://github.com/sorflex/CVAC into devel

Conflicts:
	CMakeLists.txt
Merge branch 'devel' of https://github.com/NPSVisionLab/CVAC into devel
added version so Sorflex builds get the version