updated ChangeLog
Merge branch 'master' into nook
more log
Merge branch 'master' into nook