update
Merge branch 'master' of https://github.com/Mamun/zme

Conflicts:
	zme-web/cljs/resources/unit-test.js
	zme-web/resources/public/assets/javascripts/zme.js
	zme-web/resources/public/assets/javascripts/zme.min.js

 Committer: mamun <mamun@ubuntu.ubuntu-domain>
update file