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