updated ChangeLog
Merge branch 'master' into nook
djvu plugin entry
Merge branch 'master' into nook