Remove sails socket
Merge branch 'develop'
"Merge" branch 'master' into feature/walkie-talkie