added message functionality
Merge branch 'staging' into invite