merged the code from parent repo to my forked repo

this is primarily a merge commit from the parent repo to my forked repo 
this will have the latest changes in the ui and in websocket