Proper versioning
Merge branch 'master' of https://github.com/Eyescale/vmmlib

Conflicts:
	CMakeLists.txt