Dev

Merging fatal bug repair in the chats controller