merge
Merge branch 'ChatManager' of github.com:sepm-depm/sepm-group into ChatManager