Fix merge errors:

Author: donnieberg

components/SLDSButton/index.js

@@ -13,7 +13,7 @@ import React from 'react';
 const classNames = require('classnames');
 import createChainedFunction from '../utils/create-chained-function';
 import {ButtonIcon, Icon} from '../SLDSIcons.js';
-import {omit} from 'lodash';
+import omit from 'lodash.omit';
 
 class Button extends React.Component {
 
@@ -60,6 +60,7 @@ class Button extends React.Component {
   render() {
     const props = omit('className', this.props);
     const click = createChainedFunction(this.props.onClick, this.onClick.bind(this));
+    if (this.props.disabled) { props['disabled'] = 'disabled' };
 
     //If the button is only an icon render this:
     if(this.props.variant === 'icon'){
@@ -69,7 +70,7 @@ class Button extends React.Component {
           name={this.props.iconName}
           category='utility'
           size={this.props.iconSize}
-          className={'slds-icon'} />
+          />
           <span className="slds-assistive-text">{this.props.label}</span>
         </button>
       );
@@ -78,13 +79,9 @@ class Button extends React.Component {
     else{
       return (
         <button className={this.getClassName()} {...props} onClick={click}>
-
-        {this.props.iconPosition === 'right' ? this.props.label : null}
-
-        {this.renderIcon()}
-
-        {(this.props.iconPosition === 'left' || !this.props.iconPosition) ? this.props.label : null}
-
+          {this.props.iconPosition === 'right' ? this.props.label : null}
+          {this.renderIcon()}
+          {(this.props.iconPosition === 'left' || !this.props.iconPosition) ? this.props.label : null}
         </button>
       );
     }
@@ -94,6 +91,7 @@ class Button extends React.Component {
 Button.propTypes = {
   label: React.PropTypes.string.isRequired,
   variant: React.PropTypes.oneOf(['base', 'neutral', 'brand', 'icon']),
+  disabled: React.PropTypes.bool,
   iconName: React.PropTypes.string,
   iconSize: React.PropTypes.oneOf(['x-small', 'small', 'medium', 'large']),
   iconPosition: React.PropTypes.oneOf(['left', 'right']),

components/SLDSDropdowns/index.js

@@ -10,7 +10,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 */
 
 const React = require('react');
-import {omit} from 'lodash';
+import omit from 'lodash.omit';
 const classNames = require('classnames');
 
 class GridColumn extends React.Component {

components/SLDSGrid/index.js

@@ -11,6 +11,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 import React from 'react';
 
 import SLDSSettings from './SLDSSettings';
+import SLDSUtilityIcon from './SLDSUtilityIcon';
 
 
 export const ButtonIcon = React.createClass({
@@ -42,6 +43,9 @@ export const ButtonIcon = React.createClass({
         if (this.props.hint) {
             className = className + ' slds-button__icon--hint';
         }
+        if(this.props.category === 'utility'){
+            return <SLDSUtilityIcon name={this.props.name} aria-hidden='true' className={className} />;
+        }
         return <svg aria-hidden='true' className={className} dangerouslySetInnerHTML={{__html: useTag }} />;
     }
 
@@ -72,6 +76,9 @@ export const Icon = React.createClass({
             className += ' slds-icon--' + this.props.position;
         }
         className = className + ' slds-icon-' + this.props.category + '-' + (this.props.theme || this.props.name);
+        if(this.props.category === 'utility'){
+            return <span className='slds-icon__container'><SLDSUtilityIcon name={this.props.name} aria-hidden='true' className={className} style={this.props.style}  /></span>;
+        }
         return <span className='slds-icon__container'><svg aria-hidden='true' className={className} style={this.props.style} dangerouslySetInnerHTML={{__html: useTag }} /></span>;
     }
 
@@ -82,7 +89,7 @@ export const InputIcon = React.createClass({
     render() {
         const useTag = '<use xlink:href="'+SLDSSettings.getAssetsPath()+'icons/utility-sprite/svg/symbols.svg#' + this.props.name + '" />';
         const className  = 'slds-input__icon slds-icon-text-default';
-        return <svg  aria-hidden='true' className={className} dangerouslySetInnerHTML={{__html: useTag }} />;
+        return <SLDSUtilityIcon name={this.props.name} aria-hidden='true' className={className} />;
     }
 
 });

components/SLDSIcons.js

@@ -11,12 +11,12 @@ import React, { Component } from 'react';
 import Menu from './Menu';
 import {InputIcon, ButtonIcon} from "./../SLDSIcons";
 import {Icon} from "../SLDSIcons";
-import _ from "lodash";
 import {KEYS,EventUtil} from '../utils';
+import escapeRegExp from 'lodash.escaperegexp';
 
 const defaultFilter = (term, item) => {
   if(!term) return true;
-  return item.label.match(new RegExp(_.escapeRegExp(term), 'ig'));
+  return item.label.match(new RegExp(escapeRegExp(term), 'ig'));
 };
 
 class SLDSLookup extends React.Component {