Merge branch 'wrdp' into 'develop'

Wrdp

See merge request o2oa/o2oa!2045

o2web/source/x_component_Template/MSelector.js

@@ -50,7 +50,7 @@ var MSelector = new Class({
             this.cssPath = "../x_component_Template/$MSelector/"+this.options.style+"/css.wcss";
             this._loadCss();
             if( css ){
-                this.css = Object.merge( this.css, css )
+                this.css = Object.merge( Object.clone(this.css), css )
             }
         }
 

o2web/source/x_component_Template/MTooltips.js

@@ -176,6 +176,8 @@ var MTooltips = new Class({
         this.fireEvent("queryCreate",[this]);
         this.loadStyle();
 
+        this.fireEvent("loadStyle",[this]);
+
         this.node = new Element("div.tooltipNode", {
             styles : this.nodeStyles
         }).inject( this.container );