fixed bug with version-file generation
Merge branch 'master' into 1.0.2

Conflicts:
	project.clj