Git says I have to commit before merging.
Merge remote-tracking branch 'origin/createRosterAddedController_ACE-44' into createRosterAddedController_ACE-44
Make UI for one to one chats.

ACE-49