resolve some problems
Merge branch 'develop' of https://github.com/PDI-DGS-Protolab/private_chats into develop