Update client changelog
Merge branch 'master' into live