updated ChangeLog
Merge branch 'master' into nook
fixed URL resolving
Merge branch 'master' into nook