Merged from api
Changed signalr url
Better messages
Merge