switched to a non-snapshot version number
Merge branch 'dev'
Merge branch 'dev'
core-5239 update version number
Merge branch 'master' into dev

Conflicts:
	project.clj