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