chat update
update
Merge branch 'master' into lumin
messaging