some progress on sockets
added socket integration with angular
fixed merge conflicts