resolve conflito
Merge branch 'realtime' of https://github.com/brunohstein/boraro-chat into realtime