Merge pull request #141 from shannonsans/winter-16

Fix usage of class and containerClass attributes

site/resources/lightning-svg-icon-component-helper/index.jsx

@@ -87,17 +87,18 @@ export default (
     var size = component.get("v.size");
     var name = component.get("v.name");
     var classname = component.get("v.class");
+    var containerclass = component.get("v.containerClass");
     var category = component.get("v.category");
 
     var containerClassName = [
         prefix+"icon__container",
         prefix+"icon-"+category+"-"+name,
-        classname
+        containerclass
         ].join(' ');
-    var iconClassName = prefix+"icon "+prefix+"icon--" + size;
     component.set("v.containerClass", containerClassName);
 
     var svgroot = document.createElementNS(svgns, "svg");
+    var iconClassName = prefix+"icon "+prefix+"icon--" + size+" "+classname;
     svgroot.setAttribute("aria-hidden", "true");
     svgroot.setAttribute("class", iconClassName);
     svgroot.setAttribute("name", name);