Merge branch 'hotfix/0.1.1'
Added license and url
Merge branch 'hotfix/0.1.2' into develop

Conflicts:
	project.clj