added messaging functionality
Merge branch 'messaging' into staging