Merge with UI updates
messaging in progress
Merge conflict Fixed
Started work with groups
Messages Done