Merge branch 'release/0.1'
Removed contentjon from name spaces
Merge branch 'hotfix/0.1.1' into develop

Conflicts:
	project.clj