merge of web and websocket  project in to web 

merge of web and websocket  project in to web