Merge "Adding chat module" into nyc-mr1-dev