Client Messages changes
Merge branch 'master' of github.com:SOLA-LESOTHO/messaging
Merge branch 'master' of github.com:SOLA-LESOTHO/messaging