CORE-4802: bumped the version number and the compatible database version
Merge branch 'master' into dev

Conflicts:
	project.clj
removed the SNAPSHOT version