merge master

README.md

@@ -172,7 +172,7 @@ The following command will compile Less Styles into a CSS and Concat JS files fo
 This is the most common command you will want to use and is required to view any changed you made in a browser or simulator.
 
 ```bash
-grunt build
+npm run build
 ```
 
 #### Create a Major Release:

dist/ui-toolkit.standalone.js

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 (function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.uiToolkit = f()}})(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
 'use strict';
 var React = require('react');
@@ -26334,4 +26335,6 @@ CountdownManager.prototype.time = function (currentMoment) {
 
 
 },{"./countdown.js":202,"moment":26}]},{},[23])(23)
-});
+});
+=======
+>>>>>>> master