Update README.md
Merge branch 'master' of https://github.com/NPSVisionLab/CVAC into devel
Merge branch 'devel' of https://github.com/NPSVisionLab/CVAC into devel

Conflicts:
	README.md
Merge branch 'devel' of https://github.com/NPSVisionLab/CVAC into devel
Merge branch 'devel' of https://github.com/sorflex/CVAC into devel
Fixed warning