fixing socket reconnecting issues
fixing merge conflict
Merge branch 'master' of https://github.com/aventurella/tasks