bump version
Merge branch 'master' into java6

Conflicts:
	project.clj
fix incorrect dependency