bumped the version number
Merge branch 'dev'

Conflicts:
	project.clj