small fixes of Chat and Content
Merge branch 'develop'