merge proxy with websocket.
Merge branch 'trelloLike' of https://github.com/LupoLibero/ITS into trelloLike