Merge branch 'master' of github.com:fireinice/kindlereader2

Conflicts:
	lib/ImageDownloader.py
Merge branch 'master' of github.com:fireinice/kindlereader2

Conflicts:
	lib/ImageDownloader.py