Merge branch 'master' of github.com:komagata/lokka

Merge branch 'master' of github.com:komagata/lokka

Conflicts:
	lib/lokka/importer.rb

fixed dm-tags.

added Icon for Mac.

Regenerate gemspec for version 0.1.1

fixed image paths.

fixed

fixed download url in pyha-cc.

fixed download url in pyha-cc.

fixed pyha-cc