merge webcad socketio

merge webcad socketio