Fic version number
Merge branch 'master' of https://github.com/Tempus-project/tempus

Conflicts:
	CMakeLists.txt
Fix the last merge