TODO updates
Merge branch 'master' into nook
new engine for mobi files
Merge branch 'master' into nook