Remove sails socket
Merge branch 'develop'