Merge remote-tracking branch 'bobrik/color-loading-fix' into pulls

src/app/services/querySrv.js

@@ -51,7 +51,7 @@ function (angular, _, config) {
       // Check each query object, populate its defaults
       // Check each query object, populate its defaults
       _.each(self.list,function(query,id) {
       _.each(self.list,function(query,id) {
         _.defaults(query,_query);
         _.defaults(query,_query);
-        query.color = colorAt(id);
+        query.color = query.color || colorAt(id);
       });
       });
 
 
       if (self.ids.length === 0) {
       if (self.ids.length === 0) {