class renaming; PDF & DjVu plugins in the list
Merge branch 'master' into nook