updated ChangeLog
Merge branch 'master' into nook
better current book sync
Merge branch 'master' into nook