add logic of private messages
Merge branch 'develop' into gh-pages