updated ChangeLog
Merge branch 'master' into ice-cream-sandwich
better current book sync
Merge branch 'master' into ice-cream-sandwich