Update project.clj
Merge branch 'master' into develop