Fixing some query controller issues.
added signalR client code
Merge branch 'master' into dev
Merge branch 'dev'
merged