Merged Java_SocketServer project with Explore
Merge remote-tracking branch 'origin/master'