diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 1283c8a618208..aa13f98b947ab 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -98,4 +98,5 @@ This list is manually curated to include valuable contributions by volunteers th
 | @nfmohit-wpmudev |
 | @noisysocks | @noisysocks |
 | @omarreiss | @omarreiss |
-| @hedgefield | @hedgefield |
\ No newline at end of file
+| @hedgefield | @hedgefield |
+| @hideokamoto | @hideokamoto |
diff --git a/README.md b/README.md
index 3eee7a9d54bfa..07620b84d75d5 100644
--- a/README.md
+++ b/README.md
@@ -36,7 +36,7 @@ Blocks are the unifying evolution of what is now covered, in different ways, by
 
 Imagine a custom “employee” block that a client can drag to an About page to automatically display a picture, name, and bio. A whole universe of plugins that all extend WordPress in the same way. Simplified menus and widgets. Users who can instantly understand and use WordPress  -- and 90% of plugins. This will allow you to easily compose beautiful posts like <a href="http://moc.co/sandbox/example-post/">this example</a>.
 
-Check out the <a href="https://github.com/WordPress/gutenberg/blob/master/docs/faq.md">FAQ</a> for answers to the most common questions about the project.
+Check out the <a href="https://github.com/WordPress/gutenberg/blob/master/docs/reference/faq.md">FAQ</a> for answers to the most common questions about the project.
 
 ## Compatibility
 
diff --git a/blocks/api/registration.js b/blocks/api/registration.js
index 77be97707861d..2e065e8541e39 100644
--- a/blocks/api/registration.js
+++ b/blocks/api/registration.js
@@ -149,15 +149,6 @@ export function registerBlockType( name, settings ) {
 		return;
 	}
 
-	if ( 'isPrivate' in settings ) {
-		deprecated( 'isPrivate', {
-			version: '3.1',
-			alternative: 'supports.inserter',
-			plugin: 'Gutenberg',
-		} );
-		set( settings, [ 'supports', 'inserter' ], ! settings.isPrivate );
-	}
-
 	if ( 'useOnce' in settings ) {
 		deprecated( 'useOnce', {
 			version: '3.3',
diff --git a/blocks/api/serializer.js b/blocks/api/serializer.js
index 7e2293d9619ef..cb44083495f11 100644
--- a/blocks/api/serializer.js
+++ b/blocks/api/serializer.js
@@ -164,12 +164,29 @@ export function getCommentAttributes( allAttributes, blockType ) {
 	return attributes;
 }
 
-export function serializeAttributes( attrs ) {
-	return JSON.stringify( attrs )
-		.replace( /--/g, '\\u002d\\u002d' ) // don't break HTML comments
-		.replace( /</g, '\\u003c' ) // don't break standard-non-compliant tools
-		.replace( />/g, '\\u003e' ) // ibid
-		.replace( /&/g, '\\u0026' ); // ibid
+/**
+ * Given an attributes object, returns a string in the serialized attributes
+ * format prepared for post content.
+ *
+ * @param {Object} attributes Attributes object.
+ *
+ * @return {string} Serialized attributes.
+ */
+export function serializeAttributes( attributes ) {
+	return JSON.stringify( attributes )
+		// Don't break HTML comments.
+		.replace( /--/g, '\\u002d\\u002d' )
+
+		// Don't break non-standard-compliant tools.
+		.replace( /</g, '\\u003c' )
+		.replace( />/g, '\\u003e' )
+		.replace( /&/g, '\\u0026' )
+
+		// Bypass server stripslashes behavior which would unescape stringify's
+		// escaping of quotation mark.
+		//
+		// See: https://developer.wordpress.org/reference/functions/wp_kses_stripslashes/
+		.replace( /\\"/g, '\\u0022' );
 }
 
 /**
diff --git a/blocks/api/test/parser.js b/blocks/api/test/parser.js
index b883efbd17a87..1538fd2c8753b 100644
--- a/blocks/api/test/parser.js
+++ b/blocks/api/test/parser.js
@@ -16,6 +16,8 @@ import {
 	getBlockTypes,
 	setUnknownTypeHandlerName,
 } from '../registration';
+import { createBlock } from '../factory';
+import serialize from '../serializer';
 
 describe( 'block parser', () => {
 	const defaultBlockSettings = {
@@ -571,5 +573,24 @@ describe( 'block parser', () => {
 				'core/test-block', 'core/void-block',
 			] );
 		} );
+
+		it( 'should parse with unicode escaped returned to original representation', () => {
+			registerBlockType( 'core/code', {
+				category: 'common',
+				title: 'Code Block',
+				attributes: {
+					content: {
+						type: 'string',
+					},
+				},
+				save: ( { attributes } ) => attributes.content,
+			} );
+
+			const content = '$foo = "My \"escaped\" text.";';
+			const block = createBlock( 'core/code', { content } );
+			const serialized = serialize( block );
+			const parsed = parse( serialized );
+			expect( parsed[ 0 ].attributes.content ).toBe( content );
+		} );
 	} );
 } );
diff --git a/blocks/api/test/serializer.js b/blocks/api/test/serializer.js
index f7c7c293b0889..8d14dfafa98d5 100644
--- a/blocks/api/test/serializer.js
+++ b/blocks/api/test/serializer.js
@@ -130,15 +130,22 @@ describe( 'block serializer', () => {
 		it( 'should not break HTML comments', () => {
 			expect( serializeAttributes( { a: '-- and --' } ) ).toBe( '{"a":"\\u002d\\u002d and \\u002d\\u002d"}' );
 		} );
+
 		it( 'should not break standard-non-compliant tools for "<"', () => {
 			expect( serializeAttributes( { a: '< and <' } ) ).toBe( '{"a":"\\u003c and \\u003c"}' );
 		} );
+
 		it( 'should not break standard-non-compliant tools for ">"', () => {
 			expect( serializeAttributes( { a: '> and >' } ) ).toBe( '{"a":"\\u003e and \\u003e"}' );
 		} );
+
 		it( 'should not break standard-non-compliant tools for "&"', () => {
 			expect( serializeAttributes( { a: '& and &' } ) ).toBe( '{"a":"\\u0026 and \\u0026"}' );
 		} );
+
+		it( 'should replace quotation marks', () => {
+			expect( serializeAttributes( { a: '" and "' } ) ).toBe( '{"a":"\\u0022 and \\u0022"}' );
+		} );
 	} );
 
 	describe( 'getCommentDelimitedContent()', () => {
diff --git a/blocks/deprecated-hooks.js b/blocks/deprecated-hooks.js
new file mode 100644
index 0000000000000..80bb42a2a8d94
--- /dev/null
+++ b/blocks/deprecated-hooks.js
@@ -0,0 +1,29 @@
+/**
+ * External dependencies
+ */
+import { includes } from 'lodash';
+
+/**
+ * WordPress dependencies
+ */
+import { addAction, addFilter } from '@wordpress/hooks';
+import deprecated from '@wordpress/deprecated';
+
+const forwardDeprecatedHooks = ( oldHookName, ...args ) => {
+	const deprecatedHooks = [
+		'blocks.Autocomplete.completers',
+		'blocks.BlockEdit',
+		'blocks.BlockListBlock',
+		'blocks.MediaUpload',
+	];
+	if ( includes( deprecatedHooks, oldHookName ) ) {
+		const newHookName = oldHookName.replace( 'blocks.', 'editor.' );
+		deprecated( `${ oldHookName } filter`, {
+			version: '3.3',
+			alternative: newHookName,
+		} );
+		addFilter( newHookName, ...args );
+	}
+};
+
+addAction( 'hookAdded', 'core/editor/deprecated', forwardDeprecatedHooks );
diff --git a/blocks/index.js b/blocks/index.js
index 2fed22406b3e9..98698dbaa1062 100644
--- a/blocks/index.js
+++ b/blocks/index.js
@@ -7,5 +7,6 @@
 //
 // Blocks are inferred from the HTML source of a post through a parsing mechanism
 // and then stored as objects in state, from which it is then rendered for editing.
+import './deprecated-hooks';
 import './store';
 export * from './api';
diff --git a/components/autocomplete/index.js b/components/autocomplete/index.js
index b54216355a4d0..85e07f4e8d966 100644
--- a/components/autocomplete/index.js
+++ b/components/autocomplete/index.js
@@ -348,10 +348,22 @@ export class Autocomplete extends Component {
 		/*
 		 * We support both synchronous and asynchronous retrieval of completer options
 		 * but internally treat all as async so we maintain a single, consistent code path.
+		 *
+		 * Because networks can be slow, and the internet is wonderfully unpredictable,
+		 * we don't want two promises updating the state at once. This ensures that only
+		 * the most recent promise will act on `optionsData`. This doesn't use the state
+		 * because `setState` is batched, and so there's no guarantee that setting
+		 * `activePromise` in the state would result in it actually being in `this.state`
+		 * before the promise resolves and we check to see if this is the active promise or not.
 		 */
-		Promise.resolve(
+		const promise = this.activePromise = Promise.resolve(
 			typeof options === 'function' ? options( query ) : options
 		).then( ( optionsData ) => {
+			if ( promise !== this.activePromise ) {
+				// Another promise has become active since this one was asked to resolve, so do nothing,
+				// or else we might end triggering a race condition updating the state.
+				return;
+			}
 			const keyedOptions = optionsData.map( ( optionData, optionIndex ) => ( {
 				key: `${ completer.idx }-${ optionIndex }`,
 				value: optionData,
diff --git a/components/button/index.js b/components/button/index.js
index 51ba14967f183..b36d6a4208107 100644
--- a/components/button/index.js
+++ b/components/button/index.js
@@ -24,6 +24,7 @@ export function Button( props, ref ) {
 		isBusy,
 		isDefault,
 		isLink,
+		isDestructive,
 		className,
 		disabled,
 		focus,
@@ -39,6 +40,7 @@ export function Button( props, ref ) {
 		'is-toggled': isToggled,
 		'is-busy': isBusy,
 		'is-link': isLink,
+		'is-destructive': isDestructive,
 	} );
 
 	const tag = href !== undefined && ! disabled ? 'a' : 'button';
diff --git a/components/button/style.scss b/components/button/style.scss
index 2d4d6df118d8a..63fc4b73c473f 100644
--- a/components/button/style.scss
+++ b/components/button/style.scss
@@ -54,7 +54,6 @@
 			background: #f7f7f7 !important;
 			box-shadow: none !important;
 			text-shadow: 0 1px 0 #fff !important;
-			cursor: default;
 			-webkit-transform: none !important;
 			transform: none !important;
 		}
@@ -98,7 +97,6 @@
 			border-color: color( theme( button ) shade( 20% ) ) !important;
 			box-shadow: none !important;
 			text-shadow: 0 -1px 0 rgba( 0, 0, 0, 0.1 ) !important;
-			cursor: default;
 		}
 
 		&.is-busy,
@@ -124,7 +122,6 @@
 		border-radius: 0;
 		background: none;
 		outline: none;
-		cursor: pointer;
 		text-align: left;
 		/* Mimics the default link style in common.css */
 		color: #0073aa;
@@ -145,18 +142,21 @@
 		}
 	}
 
+	/* Link buttons that are red to indicate destructive behavior. */
+	&.is-link.is-destructive {
+		color: $alert-red;
+	}
+
 	&:active {
 		color: currentColor;
 	}
 
-	&:disabled {
+	&:disabled,
+	&[disabled] {
+		cursor: default;
 		opacity: 0.3;
 	}
 
-	&:not( :disabled ):not( [aria-disabled="true"] ) {
-		cursor: pointer;
-	}
-
 	&:not( :disabled ):not( [aria-disabled="true"] ):focus {
 		@include button-style__focus-active;
 	}
diff --git a/components/color-palette/index.js b/components/color-palette/index.js
index 76265e33f620f..aa633859f762e 100644
--- a/components/color-palette/index.js
+++ b/components/color-palette/index.js
@@ -31,13 +31,21 @@ export default function ColorPalette( { colors, disableCustomColors = false, val
 
 				return (
 					<div key={ color } className="components-color-palette__item-wrapper">
-						<Tooltip text={ name || sprintf( __( 'Color code: %s' ), color ) }>
+						<Tooltip
+							text={ name ||
+								// translators: %s: color hex code e.g: "#f00".
+								sprintf( __( 'Color code: %s' ), color )
+							}>
 							<button
 								type="button"
 								className={ className }
 								style={ style }
 								onClick={ applyOrUnset( color ) }
-								aria-label={ name ? sprintf( __( 'Color: %s' ), name ) : sprintf( __( 'Color code: %s' ), color ) }
+								aria-label={ name ?
+									// translators: %s: The name of the color e.g: "vivid red".
+									sprintf( __( 'Color: %s' ), name ) :
+									// translators: %s: color hex code e.g: "#f00".
+									sprintf( __( 'Color code: %s' ), color ) }
 								aria-pressed={ value === color }
 							/>
 						</Tooltip>
diff --git a/components/date-time/time.js b/components/date-time/time.js
index 43070b668f935..32bb7228d14ab 100644
--- a/components/date-time/time.js
+++ b/components/date-time/time.js
@@ -39,13 +39,13 @@ class TimePicker extends Component {
 		this.syncState( this.props );
 	}
 
-	componentWillReceiveProps( nextProps ) {
-		const { currentTime, is12Hour } = nextProps;
+	componentDidUpdate( prevProps ) {
+		const { currentTime, is12Hour } = this.props;
 		if (
-			currentTime !== this.props.currentTime ||
-			is12Hour !== this.props.is12Hour
+			currentTime !== prevProps.currentTime ||
+			is12Hour !== prevProps.is12Hour
 		) {
-			this.syncState( nextProps );
+			this.syncState( this.props );
 		}
 	}
 
diff --git a/components/dropdown/index.js b/components/dropdown/index.js
index 6364db114eb26..17faa9e5f7fe4 100644
--- a/components/dropdown/index.js
+++ b/components/dropdown/index.js
@@ -28,10 +28,10 @@ class Dropdown extends Component {
 		}
 	}
 
-	componentWillUpdate( nextProps, nextState ) {
-		const { isOpen } = nextState;
-		const { onToggle } = nextProps;
-		if ( this.state.isOpen !== isOpen && onToggle ) {
+	componentDidUpdate( prevProps, prevState ) {
+		const { isOpen } = this.state;
+		const { onToggle } = this.props;
+		if ( prevState.isOpen !== isOpen && onToggle ) {
 			onToggle( isOpen );
 		}
 	}
diff --git a/components/form-token-field/index.js b/components/form-token-field/index.js
index 8bd9ff26eb966..2a0f27256bed9 100644
--- a/components/form-token-field/index.js
+++ b/components/form-token-field/index.js
@@ -57,13 +57,15 @@ class FormTokenField extends Component {
 		}
 	}
 
-	componentWillReceiveProps( nextProps ) {
-		if ( nextProps.disabled && this.state.isActive ) {
-			this.setState( {
-				isActive: false,
-				incompleteTokenValue: '',
-			} );
+	static getDerivedStateFromProps( props, state ) {
+		if ( ! props.disabled || ! state.isActive ) {
+			return null;
 		}
+
+		return {
+			isActive: false,
+			incompleteTokenValue: '',
+		};
 	}
 
 	bindInput( ref ) {
@@ -515,7 +517,6 @@ class FormTokenField extends Component {
 		} );
 
 		let tokenFieldProps = {
-			ref: 'main',
 			className: classes,
 			tabIndex: '-1',
 		};
diff --git a/components/higher-order/navigate-regions/style.scss b/components/higher-order/navigate-regions/style.scss
index edf682bf0729c..d6378f3ee68e3 100644
--- a/components/higher-order/navigate-regions/style.scss
+++ b/components/higher-order/navigate-regions/style.scss
@@ -7,6 +7,7 @@
 		left: 0;
 		right: 0;
 		pointer-events: none;
-		border: 4px solid $blue-medium-400;
+		outline: 4px solid transparent; // Shown in Windows High Contrast mode.
+		@include region_focus( .1s );
 	}
 }
diff --git a/components/higher-order/with-api-data/index.js b/components/higher-order/with-api-data/index.js
index 6cb398bc732ed..dd87742bc69bf 100644
--- a/components/higher-order/with-api-data/index.js
+++ b/components/higher-order/with-api-data/index.js
@@ -7,6 +7,7 @@ import { mapValues, reduce, forEach, noop } from 'lodash';
  * WordPress dependencies
  */
 import { Component, createHigherOrderComponent } from '@wordpress/element';
+import isShallowEqual from '@wordpress/is-shallow-equal';
 
 /**
  * Internal dependencies
@@ -18,32 +19,26 @@ export default ( mapPropsToData ) => createHigherOrderComponent( ( WrappedCompon
 	class APIDataComponent extends Component {
 		constructor( props, context ) {
 			super( ...arguments );
-
-			this.state = {
-				dataProps: {},
-			};
-
 			this.schema = context.getAPISchema();
 			this.routeHelpers = mapValues( {
 				type: context.getAPIPostTypeRestBaseMapping(),
 				taxonomy: context.getAPITaxonomyRestBaseMapping(),
 			}, ( mapping ) => ( key ) => mapping[ key ] );
-		}
-
-		componentWillMount() {
+			this.state = {
+				dataProps: this.applyMapping( props ),
+			};
 			this.isStillMounted = true;
-			this.applyMapping( this.props );
 		}
 
 		componentDidMount() {
 			this.initializeFetchable( {} );
 		}
 
-		componentWillReceiveProps( nextProps ) {
-			this.applyMapping( nextProps );
-		}
-
 		componentDidUpdate( prevProps, prevState ) {
+			if ( ! isShallowEqual( prevProps, this.props ) ) {
+				const dataProps = this.applyMapping( this.props, this.state.dataProps );
+				this.setState( { dataProps } );
+			}
 			this.initializeFetchable( prevState.dataProps );
 		}
 
@@ -159,16 +154,14 @@ export default ( mapPropsToData ) => createHigherOrderComponent( ( WrappedCompon
 				} );
 		}
 
-		applyMapping( props ) {
-			const { dataProps } = this.state;
-
+		applyMapping( props, previousDataProps = {} ) {
 			const mapping = mapPropsToData( props, this.routeHelpers );
 			const nextDataProps = reduce( mapping, ( result, path, propName ) => {
 				// Skip if mapping already assigned into state data props
 				// Example: Component updates with one new prop and other
 				// previously existing; previously existing should not be
 				// clobbered or re-trigger fetch
-				const dataProp = dataProps[ propName ];
+				const dataProp = previousDataProps[ propName ];
 				if ( dataProp && dataProp.path === path ) {
 					result[ propName ] = dataProp;
 					return result;
@@ -209,7 +202,7 @@ export default ( mapPropsToData ) => createHigherOrderComponent( ( WrappedCompon
 				return result;
 			}, {} );
 
-			this.setState( () => ( { dataProps: nextDataProps } ) );
+			return nextDataProps;
 		}
 
 		render() {
diff --git a/components/higher-order/with-focus-return/index.js b/components/higher-order/with-focus-return/index.js
index 2dc950e3323e2..522d3433f8b7d 100644
--- a/components/higher-order/with-focus-return/index.js
+++ b/components/higher-order/with-focus-return/index.js
@@ -20,9 +20,6 @@ function withFocusReturn( WrappedComponent ) {
 
 			this.setIsFocusedTrue = () => this.isFocused = true;
 			this.setIsFocusedFalse = () => this.isFocused = false;
-		}
-
-		componentWillMount() {
 			this.activeElementOnMount = document.activeElement;
 		}
 
diff --git a/components/panel/style.scss b/components/panel/style.scss
index 95aabd6795cc1..6cfe4fc93fc8b 100644
--- a/components/panel/style.scss
+++ b/components/panel/style.scss
@@ -99,10 +99,8 @@
 }
 
 .components-panel__icon {
-	color: $dark-gray-400;
-	margin-right: 5px;
-	position: relative;
-	top: -2px;
+	color: $dark-gray-500;
+	margin: -2px 6px -2px 0;
 }
 
 .components-panel__body-toggle-icon {
diff --git a/components/popover/style.scss b/components/popover/style.scss
index 666abbcdf949b..bd1f678afd3b9 100644
--- a/components/popover/style.scss
+++ b/components/popover/style.scss
@@ -75,6 +75,7 @@ $arrow-size: 8px;
 		}
 
 		&.is-middle.is-left {
+			/*!rtl:begin:ignore*/
 			margin-left: -$arrow-size;
 
 			&:before {
@@ -92,9 +93,11 @@ $arrow-size: 8px;
 				border-right: none;
 				border-top-color: transparent;
 			}
+			/*!rtl:end:ignore*/
 		}
 
 		&.is-middle.is-right {
+			/*!rtl:begin:ignore*/
 			margin-left: $arrow-size;
 
 			&:before {
@@ -112,6 +115,7 @@ $arrow-size: 8px;
 				border-right-style: solid;
 				border-top-color: transparent;
 			}
+			/*!rtl:end:ignore*/
 		}
 	}
 
@@ -161,19 +165,23 @@ $arrow-size: 8px;
 
 	.components-popover:not(.is-mobile).is-right & {
 		position: absolute;
+		/*!rtl:ignore*/
 		left: 100%;
 	}
 
 	.components-popover:not(.is-mobile):not(.is-middle).is-right & {
+		/*!rtl:ignore*/
 		margin-left: -24px;
 	}
 
 	.components-popover:not(.is-mobile).is-left & {
 		position: absolute;
+		/*!rtl:ignore*/
 		right: 100%;
 	}
 
 	.components-popover:not(.is-mobile):not(.is-middle).is-left & {
+		/*!rtl:ignore*/
 		margin-right: -24px;
 	}
 }
diff --git a/components/server-side-render/index.js b/components/server-side-render/index.js
index ee79d209985e1..9378c785e514f 100644
--- a/components/server-side-render/index.js
+++ b/components/server-side-render/index.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies.
  */
-import { isEqual, isPlainObject, map } from 'lodash';
+import { isEqual } from 'lodash';
 
 /**
  * WordPress dependencies.
@@ -12,6 +12,7 @@ import {
 } from '@wordpress/element';
 import { __, sprintf } from '@wordpress/i18n';
 import apiRequest from '@wordpress/api-request';
+import httpBuildQuery from 'http-build-query';
 
 /**
  * Internal dependencies.
@@ -19,6 +20,11 @@ import apiRequest from '@wordpress/api-request';
 import Placeholder from '../placeholder';
 import Spinner from '../spinner';
 
+export function rendererPathWithAttributes( block, attributes = null ) {
+	return `/gutenberg/v1/block-renderer/${ block }?context=edit` +
+			( null !== attributes ? '&' + httpBuildQuery( { attributes } ) : '' );
+}
+
 export class ServerSideRender extends Component {
 	constructor( props ) {
 		super( props );
@@ -36,9 +42,9 @@ export class ServerSideRender extends Component {
 		this.isStillMounted = false;
 	}
 
-	componentWillReceiveProps( nextProps ) {
-		if ( ! isEqual( nextProps, this.props ) ) {
-			this.fetch( nextProps );
+	componentDidUpdate( prevProps ) {
+		if ( ! isEqual( prevProps, this.props ) ) {
+			this.fetch( this.props );
 		}
 	}
 
@@ -46,9 +52,9 @@ export class ServerSideRender extends Component {
 		if ( null !== this.state.response ) {
 			this.setState( { response: null } );
 		}
-		const { block, attributes = {} } = props;
+		const { block, attributes = null } = props;
 
-		const path = '/gutenberg/v1/block-renderer/' + block + '?context=edit&' + this.getQueryUrlFromObject( { attributes } );
+		const path = rendererPathWithAttributes( block, attributes );
 
 		return apiRequest( { path } ).fail( ( response ) => {
 			const failResponse = {
@@ -65,14 +71,6 @@ export class ServerSideRender extends Component {
 		} );
 	}
 
-	getQueryUrlFromObject( obj, prefix ) {
-		return map( obj, ( paramValue, paramName ) => {
-			const key = prefix ? prefix + '[' + paramName + ']' : paramName;
-			return isPlainObject( paramValue ) ? this.getQueryUrlFromObject( paramValue, key ) :
-				encodeURIComponent( key ) + '=' + encodeURIComponent( paramValue );
-		} ).join( '&' );
-	}
-
 	render() {
 		const response = this.state.response;
 		if ( ! response ) {
@@ -80,8 +78,10 @@ export class ServerSideRender extends Component {
 				<Placeholder><Spinner /></Placeholder>
 			);
 		} else if ( response.error ) {
+			// translators: %s: error message describing the problem
+			const errorMessage = sprintf( __( 'Error loading block: %s' ), response.errorMsg );
 			return (
-				<Placeholder>{ sprintf( __( 'Error loading block: %s' ), response.errorMsg ) }</Placeholder>
+				<Placeholder>{ errorMessage }</Placeholder>
 			);
 		} else if ( ! response.length ) {
 			return (
diff --git a/components/server-side-render/test/index.js b/components/server-side-render/test/index.js
new file mode 100644
index 0000000000000..e80c2dada0474
--- /dev/null
+++ b/components/server-side-render/test/index.js
@@ -0,0 +1,55 @@
+import { rendererPathWithAttributes } from '../index';
+
+describe( 'blockPathWithAttributes', function() {
+	test( 'should return an base path for empty input', function() {
+		expect( rendererPathWithAttributes( 'core/test-block', null ) ).toBe( '/gutenberg/v1/block-renderer/core/test-block?context=edit' );
+		expect( rendererPathWithAttributes( 'core/test-block' ) ).toBe( '/gutenberg/v1/block-renderer/core/test-block?context=edit' );
+	} );
+
+	test( 'should format basic url params ', function() {
+		expect(
+			rendererPathWithAttributes( 'core/test-block', {
+				stringArg: 'test',
+				nullArg: null,
+				emptyArg: '',
+				numberArg: 123,
+			} )
+		).toBe(
+			'/gutenberg/v1/block-renderer/core/test-block?context=edit&attributes%5BstringArg%5D=test&attributes%5BnullArg%5D=&attributes%5BemptyArg%5D=&attributes%5BnumberArg%5D=123',
+		);
+	} );
+
+	test( 'should format object params ', function() {
+		expect(
+			rendererPathWithAttributes( 'core/test-block', {
+				objectArg: {
+					stringProp: 'test',
+					numberProp: 123,
+				},
+			} )
+		).toBe(
+			'/gutenberg/v1/block-renderer/core/test-block?context=edit&attributes%5BobjectArg%5D%5BstringProp%5D=test&attributes%5BobjectArg%5D%5BnumberProp%5D=123',
+		);
+	} );
+
+	test( 'should format an array of objects', function() {
+		expect(
+			rendererPathWithAttributes( 'core/test-block', {
+				children: [
+					{
+						name: 'bobby',
+						age: 12,
+						sex: 'M',
+					},
+					{
+						name: 'sally',
+						age: 8,
+						sex: 'F',
+					},
+				],
+			} )
+		).toBe(
+			'/gutenberg/v1/block-renderer/core/test-block?context=edit&attributes%5Bchildren%5D%5B0%5D%5Bname%5D=bobby&attributes%5Bchildren%5D%5B0%5D%5Bage%5D=12&attributes%5Bchildren%5D%5B0%5D%5Bsex%5D=M&attributes%5Bchildren%5D%5B1%5D%5Bname%5D=sally&attributes%5Bchildren%5D%5B1%5D%5Bage%5D=8&attributes%5Bchildren%5D%5B1%5D%5Bsex%5D=F',
+		);
+	} );
+} );
diff --git a/components/slot-fill/fill.js b/components/slot-fill/fill.js
index 9675fc215882f..27f8da4c6fa85 100644
--- a/components/slot-fill/fill.js
+++ b/components/slot-fill/fill.js
@@ -11,7 +11,8 @@ import { Component, createPortal } from '@wordpress/element';
 let occurrences = 0;
 
 class Fill extends Component {
-	componentWillMount() {
+	constructor() {
+		super( ...arguments );
 		this.occurrence = ++occurrences;
 	}
 
@@ -38,15 +39,15 @@ class Fill extends Component {
 		unregisterFill( this.props.name, this );
 	}
 
-	componentWillReceiveProps( nextProps ) {
-		const { name } = nextProps;
+	componentDidUpdate( prevProps ) {
+		const { name } = this.props;
 		const {
 			unregisterFill = noop,
 			registerFill = noop,
 		} = this.context;
 
-		if ( this.props.name !== name ) {
-			unregisterFill( this.props.name, this );
+		if ( prevProps.name !== name ) {
+			unregisterFill( prevProps.name, this );
 			registerFill( name, this );
 		}
 	}
diff --git a/components/slot-fill/slot.js b/components/slot-fill/slot.js
index 4785e6e0837d1..d36900e8b58b3 100644
--- a/components/slot-fill/slot.js
+++ b/components/slot-fill/slot.js
@@ -27,15 +27,15 @@ class Slot extends Component {
 		unregisterSlot( this.props.name, this );
 	}
 
-	componentWillReceiveProps( nextProps ) {
-		const { name } = nextProps;
+	componentDidUpdate( prevProps ) {
+		const { name } = this.props;
 		const {
 			unregisterSlot = noop,
 			registerSlot = noop,
 		} = this.context;
 
-		if ( this.props.name !== name ) {
-			unregisterSlot( this.props.name );
+		if ( prevProps.name !== name ) {
+			unregisterSlot( prevProps.name );
 			registerSlot( name, this );
 		}
 	}
diff --git a/components/toolbar/style.scss b/components/toolbar/style.scss
index 024ed169a7eae..f827b169fa05e 100644
--- a/components/toolbar/style.scss
+++ b/components/toolbar/style.scss
@@ -45,7 +45,7 @@ div.components-toolbar {
 	width: $icon-button-size;
 	height: $icon-button-size;
 
-	// unset icon button styles
+	// Unset icon button styles
 	&:active,
 	&:not( [aria-disabled="true"] ):hover,
 	&:not( [aria-disabled="true"] ):focus {
@@ -55,7 +55,7 @@ div.components-toolbar {
 		border: none;
 	}
 
-	// disabled
+	// Disabled
 	&:disabled {
 		cursor: default;
 	}
@@ -66,7 +66,7 @@ div.components-toolbar {
 		border-radius: $button-style__radius-roundrect;
 	}
 
-	// subscript for numbered icon buttons, like headings
+	// Subscript for numbered icon buttons, like headings
 	&[data-subscript] svg {
 		padding: 4px 8px 4px 0;
 	}
@@ -81,13 +81,17 @@ div.components-toolbar {
 		bottom: 8px;
 	}
 
-	// hover style
+	// Assign hover style to child element, not the button itself
+	&:not( :disabled ):not([aria-disabled="true"]):hover {
+		box-shadow: none;
+	}
+
 	&:not( :disabled ).is-active > svg,
 	&:not( :disabled ):hover > svg {
 		@include formatting-button-style__hover;
 	}
 
-	// active & toggled style
+	// Active & toggled style
 	&:not(:disabled).is-active > svg {
 		@include formatting-button-style__active;
 	}
@@ -96,7 +100,7 @@ div.components-toolbar {
 		color: $white;
 	}
 
-	// focus style
+	// Focus style
 	&:not(:disabled):focus > svg {
 		@include formatting-button-style__focus;
 	}
diff --git a/core-blocks/audio/edit.js b/core-blocks/audio/edit.js
index 9379870d39080..8b2d2d8db1898 100644
--- a/core-blocks/audio/edit.js
+++ b/core-blocks/audio/edit.js
@@ -2,7 +2,7 @@
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
-import { IconButton, Toolbar } from '@wordpress/components';
+import { IconButton, Toolbar, withNotices } from '@wordpress/components';
 import { Component, Fragment } from '@wordpress/element';
 import {
 	MediaPlaceholder,
@@ -15,7 +15,7 @@ import {
  */
 import './editor.scss';
 
-export default class AudioEdit extends Component {
+class AudioEdit extends Component {
 	constructor() {
 		super( ...arguments );
 		// edit component has its own src in the state so it can be edited
@@ -27,18 +27,23 @@ export default class AudioEdit extends Component {
 
 	render() {
 		const { caption, src } = this.props.attributes;
-		const { setAttributes, isSelected, className } = this.props;
+		const { setAttributes, isSelected, className, noticeOperations, noticeUI } = this.props;
 		const { editing } = this.state;
 		const switchToEditing = () => {
 			this.setState( { editing: true } );
 		};
 		const onSelectAudio = ( media ) => {
-			if ( media && media.url ) {
-				// sets the block's attribute and updates the edit component from the
-				// selected media, then switches off the editing UI
-				setAttributes( { src: media.url, id: media.id } );
-				this.setState( { src: media.url, editing: false } );
+			if ( ! media || ! media.url ) {
+				// in this case there was an error and we should continue in the editing state
+				// previous attributes should be removed because they may be temporary blob urls
+				setAttributes( { src: undefined, id: undefined } );
+				switchToEditing();
+				return;
 			}
+			// sets the block's attribute and updates the edit component from the
+			// selected media, then switches off the editing UI
+			setAttributes( { src: media.url, id: media.id } );
+			this.setState( { src: media.url, editing: false } );
 		};
 		const onSelectUrl = ( newSrc ) => {
 			// set the block's src from the edit component's state, and switch off the editing UI
@@ -62,6 +67,8 @@ export default class AudioEdit extends Component {
 					accept="audio/*"
 					type="audio"
 					value={ this.props.attributes }
+					notices={ noticeUI }
+					onError={ noticeOperations.createErrorNotice }
 				/>
 			);
 		}
@@ -96,3 +103,5 @@ export default class AudioEdit extends Component {
 		/* eslint-enable jsx-a11y/no-static-element-interactions, jsx-a11y/onclick-has-role, jsx-a11y/click-events-have-key-events */
 	}
 }
+
+export default withNotices( AudioEdit );
diff --git a/core-blocks/block/indicator/index.js b/core-blocks/block/indicator/index.js
index ffeb4bffcfb32..403ed6d563f86 100644
--- a/core-blocks/block/indicator/index.js
+++ b/core-blocks/block/indicator/index.js
@@ -10,8 +10,10 @@ import { __, sprintf } from '@wordpress/i18n';
 import './style.scss';
 
 function SharedBlockIndicator( { title } ) {
+	// translators: %s: title/name of the shared block
+	const tooltipText = sprintf( __( 'Shared Block: %s' ), title );
 	return (
-		<Tooltip text={ sprintf( __( 'Shared Block: %s' ), title ) }>
+		<Tooltip text={ tooltipText }>
 			<span className="shared-block-indicator">
 				<Dashicon icon="controls-repeat" />
 			</span>
diff --git a/core-blocks/button/edit.js b/core-blocks/button/edit.js
index cc8e275c737c6..84e666c7354c0 100644
--- a/core-blocks/button/edit.js
+++ b/core-blocks/button/edit.js
@@ -141,11 +141,4 @@ class ButtonEdit extends Component {
 	}
 }
 
-export default withColors( ( getColor, setColor, { attributes } ) => {
-	return {
-		backgroundColor: getColor( attributes.backgroundColor, attributes.customBackgroundColor, 'background-color' ),
-		setBackgroundColor: setColor( 'backgroundColor', 'customBackgroundColor' ),
-		textColor: getColor( attributes.textColor, attributes.customTextColor, 'color' ),
-		setTextColor: setColor( 'textColor', 'customTextColor' ),
-	};
-} )( ButtonEdit );
+export default withColors( 'backgroundColor', { textColor: 'color' } )( ButtonEdit );
diff --git a/core-blocks/button/test/__snapshots__/index.js.snap b/core-blocks/button/test/__snapshots__/index.js.snap
index 08b41dc9bc20a..08485547c1c10 100644
--- a/core-blocks/button/test/__snapshots__/index.js.snap
+++ b/core-blocks/button/test/__snapshots__/index.js.snap
@@ -16,7 +16,7 @@ exports[`core/button block edit matches snapshot 1`] = `
             aria-autocomplete="list"
             aria-expanded="false"
             aria-label="Add text…"
-            aria-multiline="false"
+            aria-multiline="true"
             class="wp-block-button__link editor-rich-text__tinymce"
             contenteditable="true"
             data-is-placeholder-visible="true"
diff --git a/core-blocks/cover-image/index.js b/core-blocks/cover-image/index.js
index be5c94471eec6..70d09efbd1514 100644
--- a/core-blocks/cover-image/index.js
+++ b/core-blocks/cover-image/index.js
@@ -7,7 +7,7 @@ import classnames from 'classnames';
 /**
  * WordPress dependencies
  */
-import { IconButton, PanelBody, RangeControl, ToggleControl, Toolbar } from '@wordpress/components';
+import { IconButton, PanelBody, RangeControl, ToggleControl, Toolbar, withNotices } from '@wordpress/components';
 import { Fragment } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
 import { createBlock } from '@wordpress/blocks';
@@ -99,10 +99,16 @@ export const settings = {
 		}
 	},
 
-	edit( { attributes, setAttributes, isSelected, className } ) {
+	edit: withNotices( ( { attributes, setAttributes, isSelected, className, noticeOperations, noticeUI } ) => {
 		const { url, title, align, contentAlign, id, hasParallax, dimRatio } = attributes;
 		const updateAlignment = ( nextAlign ) => setAttributes( { align: nextAlign } );
-		const onSelectImage = ( media ) => setAttributes( { url: media.url, id: media.id } );
+		const onSelectImage = ( media ) => {
+			if ( ! media || ! media.url ) {
+				setAttributes( { url: undefined, id: undefined } );
+				return;
+			}
+			setAttributes( { url: media.url, id: media.id } );
+		};
 		const toggleParallax = () => setAttributes( { hasParallax: ! hasParallax } );
 		const setDimRatio = ( ratio ) => setAttributes( { dimRatio: ratio } );
 
@@ -193,6 +199,8 @@ export const settings = {
 						onSelect={ onSelectImage }
 						accept="image/*"
 						type="image"
+						notices={ noticeUI }
+						onError={ noticeOperations.createErrorNotice }
 					/>
 				</Fragment>
 			);
@@ -219,7 +227,7 @@ export const settings = {
 				</div>
 			</Fragment>
 		);
-	},
+	} ),
 
 	save( { attributes, className } ) {
 		const { url, title, hasParallax, dimRatio, align, contentAlign } = attributes;
diff --git a/core-blocks/embed/index.js b/core-blocks/embed/index.js
index b2c17bac4435b..1332db7164099 100644
--- a/core-blocks/embed/index.js
+++ b/core-blocks/embed/index.js
@@ -102,7 +102,7 @@ function getEmbedBlockSettings( { title, description, icon, category = 'embed',
 				};
 			}
 
-			componentWillMount() {
+			componentDidMount() {
 				this.doServerSideRender();
 			}
 
@@ -209,6 +209,7 @@ function getEmbedBlockSettings( { title, description, icon, category = 'embed',
 				}
 
 				if ( ! html ) {
+					// translators: %s: type of embed e.g: "YouTube", "Twitter", etc. "Embed" is used when no specific type exists
 					const label = sprintf( __( '%s URL' ), title );
 
 					return (
@@ -237,6 +238,7 @@ function getEmbedBlockSettings( { title, description, icon, category = 'embed',
 
 				const parsedUrl = parse( url );
 				const cannotPreview = includes( HOSTS_NO_PREVIEWS, parsedUrl.host.replace( /^www\./, '' ) );
+				// translators: %s: host providing embed content e.g: www.youtube.com
 				const iframeTitle = sprintf( __( 'Embedded content from %s' ), parsedUrl.host );
 				const embedWrapper = 'wp-embed' === type ? (
 					<div
diff --git a/core-blocks/gallery/edit.js b/core-blocks/gallery/edit.js
index 340ada695bc98..7d776823c0264 100644
--- a/core-blocks/gallery/edit.js
+++ b/core-blocks/gallery/edit.js
@@ -89,7 +89,7 @@ class GalleryEdit extends Component {
 
 	onSelectImages( images ) {
 		this.props.setAttributes( {
-			images: images.map( ( image ) => pick( image, [ 'alt', 'caption', 'id', 'url' ] ) ),
+			images: images.map( ( image ) => pick( image, [ 'alt', 'caption', 'id', 'link', 'url' ] ) ),
 		} );
 	}
 
@@ -149,9 +149,9 @@ class GalleryEdit extends Component {
 		} );
 	}
 
-	componentWillReceiveProps( nextProps ) {
+	componentDidUpdate( prevProps ) {
 		// Deselect images when deselecting the block
-		if ( ! nextProps.isSelected && this.props.isSelected ) {
+		if ( ! this.props.isSelected && prevProps.isSelected ) {
 			this.setState( {
 				selectedImage: null,
 				captionSelected: false,
diff --git a/core-blocks/gallery/editor.scss b/core-blocks/gallery/editor.scss
index 81304ff77a3a6..cbe95fcb30861 100644
--- a/core-blocks/gallery/editor.scss
+++ b/core-blocks/gallery/editor.scss
@@ -100,3 +100,14 @@
 	left: 50%;
 	transform: translate( -50%, -50% );
 }
+
+// IE11 doesn't support object-fit or flex very well, so we inline-block.
+@media all and ( -ms-high-contrast: none ) {
+	*::-ms-backdrop, .blocks-gallery-item {
+		display: inline-block;
+	}
+
+	*::-ms-backdrop, .blocks-gallery-item img {
+		width: 100%;
+	}
+}
\ No newline at end of file
diff --git a/core-blocks/gallery/gallery-image.js b/core-blocks/gallery/gallery-image.js
index 759d7068e31a1..6301bbb2fec8e 100644
--- a/core-blocks/gallery/gallery-image.js
+++ b/core-blocks/gallery/gallery-image.js
@@ -71,7 +71,8 @@ class GalleryImage extends Component {
 		}
 	}
 
-	componentWillReceiveProps( { isSelected, image, url } ) {
+	componentDidUpdate( prevProps ) {
+		const { isSelected, image, url } = this.props;
 		if ( image && ! url ) {
 			this.props.setAttributes( {
 				url: image.source_url,
@@ -81,7 +82,7 @@ class GalleryImage extends Component {
 
 		// unselect the caption so when the user selects other image and comeback
 		// the caption is not immediately selected
-		if ( this.state.captionSelected && ! isSelected && this.props.isSelected ) {
+		if ( this.state.captionSelected && ! isSelected && prevProps.isSelected ) {
 			this.setState( {
 				captionSelected: false,
 			} );
diff --git a/core-blocks/gallery/style.scss b/core-blocks/gallery/style.scss
index 9bdaaafc9105b..6d51a93880593 100644
--- a/core-blocks/gallery/style.scss
+++ b/core-blocks/gallery/style.scss
@@ -15,7 +15,6 @@
 		justify-content: center;
 		position: relative;
 
-
 		figure {
 			margin: 0;
 			height: 100%;
@@ -53,12 +52,6 @@
 			object-fit: cover;
 
 		}
-
-		// Alas, IE11+ doesn't support object-fit
-		_:-ms-lang(x), figure {
-			height: auto;
-			width: auto;
-		}
 	}
 
 	// Responsive fallback value, 2 columns
diff --git a/core-blocks/heading/edit.js b/core-blocks/heading/edit.js
index 60869aca35e3f..05b4fc9df600e 100644
--- a/core-blocks/heading/edit.js
+++ b/core-blocks/heading/edit.js
@@ -29,6 +29,7 @@ export default function HeadingEdit( {
 				<Toolbar
 					controls={ '234'.split( '' ).map( ( level ) => ( {
 						icon: 'heading',
+						// translators: %s: heading level e.g: "1", "2", "3"
 						title: sprintf( __( 'Heading %s' ), level ),
 						isActive: 'H' + level === nodeName,
 						onClick: () => setAttributes( { nodeName: 'H' + level } ),
@@ -42,6 +43,7 @@ export default function HeadingEdit( {
 					<Toolbar
 						controls={ '123456'.split( '' ).map( ( level ) => ( {
 							icon: 'heading',
+							// translators: %s: heading level e.g: "1", "2", "3"
 							title: sprintf( __( 'Heading %s' ), level ),
 							isActive: 'H' + level === nodeName,
 							onClick: () => setAttributes( { nodeName: 'H' + level } ),
diff --git a/core-blocks/heading/test/__snapshots__/index.js.snap b/core-blocks/heading/test/__snapshots__/index.js.snap
index 6a817645c35e2..a09f615febec2 100644
--- a/core-blocks/heading/test/__snapshots__/index.js.snap
+++ b/core-blocks/heading/test/__snapshots__/index.js.snap
@@ -13,7 +13,7 @@ exports[`core/heading block edit matches snapshot 1`] = `
           aria-autocomplete="list"
           aria-expanded="false"
           aria-label="Write heading…"
-          aria-multiline="false"
+          aria-multiline="true"
           class="editor-rich-text__tinymce"
           contenteditable="true"
           data-is-placeholder-visible="true"
diff --git a/core-blocks/image/edit.js b/core-blocks/image/edit.js
index 691f3f7abb533..49a718da13565 100644
--- a/core-blocks/image/edit.js
+++ b/core-blocks/image/edit.js
@@ -97,10 +97,8 @@ class ImageEdit extends Component {
 		if ( ! prevID && prevUrl.indexOf( 'blob:' ) === 0 && id && url.indexOf( 'blob:' ) === -1 ) {
 			revokeBlobURL( url );
 		}
-	}
 
-	componentWillReceiveProps( { isSelected } ) {
-		if ( ! isSelected && this.props.isSelected && this.state.captionFocused ) {
+		if ( ! this.props.isSelected && prevProps.isSelected && this.state.captionFocused ) {
 			this.setState( {
 				captionFocused: false,
 			} );
@@ -108,7 +106,7 @@ class ImageEdit extends Component {
 	}
 
 	onSelectImage( media ) {
-		if ( ! media ) {
+		if ( ! media || ! media.url ) {
 			this.props.setAttributes( {
 				url: undefined,
 				alt: undefined,
@@ -318,7 +316,6 @@ class ImageEdit extends Component {
 		return (
 			<Fragment>
 				{ controls }
-				{ noticeUI }
 				<figure className={ classes }>
 					<ImageSize src={ url } dirtynessTrigger={ align }>
 						{ ( sizes ) => {
diff --git a/core-blocks/list/test/__snapshots__/index.js.snap b/core-blocks/list/test/__snapshots__/index.js.snap
index 611b782538e96..d17def7ea765e 100644
--- a/core-blocks/list/test/__snapshots__/index.js.snap
+++ b/core-blocks/list/test/__snapshots__/index.js.snap
@@ -17,6 +17,7 @@ exports[`core/list block edit matches snapshot 1`] = `
           class="editor-rich-text__tinymce"
           contenteditable="true"
           data-is-placeholder-visible="true"
+          role="textbox"
         />
         <ul
           class="editor-rich-text__tinymce"
diff --git a/core-blocks/paragraph/index.js b/core-blocks/paragraph/index.js
index d7df95c47dc7e..7f24c38f90b68 100644
--- a/core-blocks/paragraph/index.js
+++ b/core-blocks/paragraph/index.js
@@ -210,49 +210,47 @@ class ParagraphBlock extends Component {
 						isLargeText={ fontSize >= 18 }
 					/>
 				</InspectorControls>
-				<div>
-					<RichText
-						tagName="p"
-						className={ classnames( 'wp-block-paragraph', className, {
-							'has-background': backgroundColor.value,
-							'has-drop-cap': dropCap,
-							[ backgroundColor.class ]: backgroundColor.class,
-							[ textColor.class ]: textColor.class,
-						} ) }
-						style={ {
-							backgroundColor: backgroundColor.class ? undefined : backgroundColor.value,
-							color: textColor.class ? undefined : textColor.value,
-							fontSize: fontSize ? fontSize + 'px' : undefined,
-							textAlign: align,
-						} }
-						value={ content }
-						onChange={ ( nextContent ) => {
-							setAttributes( {
-								content: nextContent,
-							} );
-						} }
-						onSplit={ insertBlocksAfter ?
-							( before, after, ...blocks ) => {
-								if ( after ) {
-									blocks.push( createBlock( name, { content: after } ) );
-								}
-
-								insertBlocksAfter( blocks );
-
-								if ( before ) {
-									setAttributes( { content: before } );
-								} else {
-									onReplace( [] );
-								}
-							} :
-							undefined
-						}
-						onMerge={ mergeBlocks }
-						onReplace={ this.onReplace }
-						onRemove={ () => onReplace( [] ) }
-						placeholder={ placeholder || __( 'Add text or type / to add content' ) }
-					/>
-				</div>
+				<RichText
+					tagName="p"
+					className={ classnames( 'wp-block-paragraph', className, {
+						'has-background': backgroundColor.value,
+						'has-drop-cap': dropCap,
+						[ backgroundColor.class ]: backgroundColor.class,
+						[ textColor.class ]: textColor.class,
+					} ) }
+					style={ {
+						backgroundColor: backgroundColor.class ? undefined : backgroundColor.value,
+						color: textColor.class ? undefined : textColor.value,
+						fontSize: fontSize ? fontSize + 'px' : undefined,
+						textAlign: align,
+					} }
+					value={ content }
+					onChange={ ( nextContent ) => {
+						setAttributes( {
+							content: nextContent,
+						} );
+					} }
+					onSplit={ insertBlocksAfter ?
+						( before, after, ...blocks ) => {
+							if ( after ) {
+								blocks.push( createBlock( name, { content: after } ) );
+							}
+
+							insertBlocksAfter( blocks );
+
+							if ( before ) {
+								setAttributes( { content: before } );
+							} else {
+								onReplace( [] );
+							}
+						} :
+						undefined
+					}
+					onMerge={ mergeBlocks }
+					onReplace={ this.onReplace }
+					onRemove={ () => onReplace( [] ) }
+					placeholder={ placeholder || __( 'Add text or type / to add content' ) }
+				/>
 			</Fragment>
 		);
 	}
@@ -454,17 +452,10 @@ export const settings = {
 		}
 	},
 
-	edit: compose(
-		withColors( ( getColor, setColor, { attributes } ) => {
-			return {
-				backgroundColor: getColor( attributes.backgroundColor, attributes.customBackgroundColor, 'background-color' ),
-				setBackgroundColor: setColor( 'backgroundColor', 'customBackgroundColor' ),
-				textColor: getColor( attributes.textColor, attributes.customTextColor, 'color' ),
-				setTextColor: setColor( 'textColor', 'customTextColor' ),
-			};
-		} ),
+	edit: compose( [
+		withColors( 'backgroundColor', { textColor: 'color' } ),
 		FallbackStyles,
-	)( ParagraphBlock ),
+	] )( ParagraphBlock ),
 
 	save( { attributes } ) {
 		const {
diff --git a/core-blocks/paragraph/test/__snapshots__/index.js.snap b/core-blocks/paragraph/test/__snapshots__/index.js.snap
index 95143b5865588..73dfd3da4df06 100644
--- a/core-blocks/paragraph/test/__snapshots__/index.js.snap
+++ b/core-blocks/paragraph/test/__snapshots__/index.js.snap
@@ -3,31 +3,29 @@
 exports[`core/paragraph block edit matches snapshot 1`] = `
 <div>
    
-  <div>
-    <div
-      class="editor-rich-text"
-    >
+  <div
+    class="editor-rich-text"
+  >
+    <div>
       <div>
-        <div>
-          <div
-            class="components-autocomplete"
+        <div
+          class="components-autocomplete"
+        >
+          <p
+            aria-autocomplete="list"
+            aria-expanded="false"
+            aria-label="Add text or type / to add content"
+            aria-multiline="true"
+            class="wp-block-paragraph editor-rich-text__tinymce"
+            contenteditable="true"
+            data-is-placeholder-visible="true"
+            role="textbox"
+          />
+          <p
+            class="editor-rich-text__tinymce wp-block-paragraph"
           >
-            <p
-              aria-autocomplete="list"
-              aria-expanded="false"
-              aria-label="Add text or type / to add content"
-              aria-multiline="false"
-              class="wp-block-paragraph editor-rich-text__tinymce"
-              contenteditable="true"
-              data-is-placeholder-visible="true"
-              role="textbox"
-            />
-            <p
-              class="editor-rich-text__tinymce wp-block-paragraph"
-            >
-              Add text or type / to add content
-            </p>
-          </div>
+            Add text or type / to add content
+          </p>
         </div>
       </div>
     </div>
diff --git a/core-blocks/preformatted/test/__snapshots__/index.js.snap b/core-blocks/preformatted/test/__snapshots__/index.js.snap
index ff76887661dcf..a0748236e6e0d 100644
--- a/core-blocks/preformatted/test/__snapshots__/index.js.snap
+++ b/core-blocks/preformatted/test/__snapshots__/index.js.snap
@@ -13,7 +13,7 @@ exports[`core/preformatted block edit matches snapshot 1`] = `
           aria-autocomplete="list"
           aria-expanded="false"
           aria-label="Write preformatted text…"
-          aria-multiline="false"
+          aria-multiline="true"
           class="editor-rich-text__tinymce"
           contenteditable="true"
           data-is-placeholder-visible="true"
diff --git a/core-blocks/quote/index.js b/core-blocks/quote/index.js
index 33ffc53117713..08bbaa286979b 100644
--- a/core-blocks/quote/index.js
+++ b/core-blocks/quote/index.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import { castArray, get, isString } from 'lodash';
+import { castArray, get, isString, isEmpty } from 'lodash';
 import classnames from 'classnames';
 
 /**
@@ -69,12 +69,15 @@ export const settings = {
 		from: [
 			{
 				type: 'block',
+				isMultiBlock: true,
 				blocks: [ 'core/paragraph' ],
-				transform: ( { content } ) => {
+				transform: ( attributes ) => {
+					const items = attributes.map( ( { content } ) => content );
+					const hasItems = ! items.every( isEmpty );
 					return createBlock( 'core/quote', {
-						value: [
-							{ children: <p key="1">{ content }</p> },
-						],
+						value: hasItems ?
+							items.map( ( content, index ) => ( { children: <p key={ index }>{ content }</p> } ) ) :
+							[],
 					} );
 				},
 			},
diff --git a/core-blocks/table/test/__snapshots__/index.js.snap b/core-blocks/table/test/__snapshots__/index.js.snap
index 8214a201bb281..e336bc498289e 100644
--- a/core-blocks/table/test/__snapshots__/index.js.snap
+++ b/core-blocks/table/test/__snapshots__/index.js.snap
@@ -12,7 +12,6 @@ exports[`core/embed block edit matches snapshot 1`] = `
         <table
           aria-autocomplete="list"
           aria-expanded="false"
-          aria-multiline="false"
           class="editor-rich-text__tinymce"
           contenteditable="true"
         >
diff --git a/core-blocks/test/helpers/index.js b/core-blocks/test/helpers/index.js
index 53cc1187ffe05..7231a3fd0fe09 100644
--- a/core-blocks/test/helpers/index.js
+++ b/core-blocks/test/helpers/index.js
@@ -31,7 +31,6 @@ export const blockEditRender = ( name, settings ) => {
 			attributes={ block.attributes }
 			setAttributes={ noop }
 			user={ {} }
-			createInnerBlockList={ noop }
 		/>
 	);
 };
diff --git a/core-blocks/text-columns/test/__snapshots__/index.js.snap b/core-blocks/text-columns/test/__snapshots__/index.js.snap
index 439500fc13b23..b618bdb565e07 100644
--- a/core-blocks/text-columns/test/__snapshots__/index.js.snap
+++ b/core-blocks/text-columns/test/__snapshots__/index.js.snap
@@ -19,7 +19,7 @@ exports[`core/text-columns block edit matches snapshot 1`] = `
               aria-autocomplete="list"
               aria-expanded="false"
               aria-label="New Column"
-              aria-multiline="false"
+              aria-multiline="true"
               class="editor-rich-text__tinymce"
               contenteditable="true"
               data-is-placeholder-visible="true"
@@ -50,7 +50,7 @@ exports[`core/text-columns block edit matches snapshot 1`] = `
               aria-autocomplete="list"
               aria-expanded="false"
               aria-label="New Column"
-              aria-multiline="false"
+              aria-multiline="true"
               class="editor-rich-text__tinymce"
               contenteditable="true"
               data-is-placeholder-visible="true"
diff --git a/core-blocks/verse/test/__snapshots__/index.js.snap b/core-blocks/verse/test/__snapshots__/index.js.snap
index b33b596d591bc..dadd75177de95 100644
--- a/core-blocks/verse/test/__snapshots__/index.js.snap
+++ b/core-blocks/verse/test/__snapshots__/index.js.snap
@@ -13,7 +13,7 @@ exports[`core/verse block edit matches snapshot 1`] = `
           aria-autocomplete="list"
           aria-expanded="false"
           aria-label="Write…"
-          aria-multiline="false"
+          aria-multiline="true"
           class="editor-rich-text__tinymce"
           contenteditable="true"
           data-is-placeholder-visible="true"
diff --git a/core-blocks/video/edit.js b/core-blocks/video/edit.js
index d7a2410272086..729c3b0813f27 100644
--- a/core-blocks/video/edit.js
+++ b/core-blocks/video/edit.js
@@ -2,7 +2,7 @@
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
-import { IconButton, Toolbar } from '@wordpress/components';
+import { IconButton, Toolbar, withNotices } from '@wordpress/components';
 import { Component, Fragment } from '@wordpress/element';
 import {
 	MediaPlaceholder,
@@ -15,7 +15,7 @@ import {
  */
 import './editor.scss';
 
-export default class VideoEdit extends Component {
+class VideoEdit extends Component {
 	constructor() {
 		super( ...arguments );
 		// edit component has its own src in the state so it can be edited
@@ -27,18 +27,23 @@ export default class VideoEdit extends Component {
 
 	render() {
 		const { caption, src } = this.props.attributes;
-		const { setAttributes, isSelected, className } = this.props;
+		const { setAttributes, isSelected, className, noticeOperations, noticeUI } = this.props;
 		const { editing } = this.state;
 		const switchToEditing = () => {
 			this.setState( { editing: true } );
 		};
 		const onSelectVideo = ( media ) => {
-			if ( media && media.url ) {
-				// sets the block's attribute and updates the edit component from the
-				// selected media, then switches off the editing UI
-				setAttributes( { src: media.url, id: media.id } );
-				this.setState( { src: media.url, editing: false } );
+			if ( ! media || ! media.url ) {
+				// in this case there was an error and we should continue in the editing state
+				// previous attributes should be removed because they may be temporary blob urls
+				setAttributes( { src: undefined, id: undefined } );
+				switchToEditing();
+				return;
 			}
+			// sets the block's attribute and updates the edit component from the
+			// selected media, then switches off the editing UI
+			setAttributes( { src: media.url, id: media.id } );
+			this.setState( { src: media.url, editing: false } );
 		};
 		const onSelectUrl = ( newSrc ) => {
 			// set the block's src from the edit component's state, and switch off the editing UI
@@ -62,6 +67,8 @@ export default class VideoEdit extends Component {
 					accept="video/*"
 					type="video"
 					value={ this.props.attributes }
+					notices={ noticeUI }
+					onError={ noticeOperations.createErrorNotice }
 				/>
 			);
 		}
@@ -96,3 +103,5 @@ export default class VideoEdit extends Component {
 		/* eslint-enable jsx-a11y/no-static-element-interactions, jsx-a11y/onclick-has-role, jsx-a11y/click-events-have-key-events */
 	}
 }
+
+export default withNotices( VideoEdit );
diff --git a/docs/block-api.md b/docs/block-api.md
index 3d78be7c0001e..72f105645035c 100644
--- a/docs/block-api.md
+++ b/docs/block-api.md
@@ -79,6 +79,8 @@ when they are applicable e.g.: in the inserter.
 icon: {
 	// Specifying a background color to appear with the icon e.g.: in the inserter.
 	background: '#7e70af',
+	// Specifying a color for the icon (optional: if not set, a readable color will be automatically defined)
+	foreground: '#fff',
 	// Specifying a dashicon for the block
 	src: 'book-alt',
 } ,
diff --git a/docs/data/core-blocks.md b/docs/data/core-blocks.md
new file mode 100644
index 0000000000000..93fe60ab0c488
--- /dev/null
+++ b/docs/data/core-blocks.md
@@ -0,0 +1,82 @@
+# **core/blocks**: Block Types Data
+
+## Selectors 
+
+### getBlockType
+
+Returns a block type by name.
+
+*Parameters*
+
+ * state: Data state.
+ * name: Block type name.
+
+### getCategories
+
+Returns all the available categories.
+
+*Parameters*
+
+ * state: Data state.
+
+*Returns*
+
+Categories list.
+
+### getDefaultBlockName
+
+Returns the name of the default block name.
+
+*Parameters*
+
+ * state: Data state.
+
+*Returns*
+
+Default block name.
+
+### getFallbackBlockName
+
+Returns the name of the fallback block name.
+
+*Parameters*
+
+ * state: Data state.
+
+*Returns*
+
+Fallback block name.
+
+## Actions
+
+### addBlockTypes
+
+Returns an action object used in signalling that block types have been added.
+
+*Parameters*
+
+ * blockTypes: Block types received.
+
+### removeBlockTypes
+
+Returns an action object used to remove a registered block type.
+
+*Parameters*
+
+ * names: Block name.
+
+### setDefaultBlockName
+
+Returns an action object used to set the default block name.
+
+*Parameters*
+
+ * name: Block name.
+
+### setFallbackBlockName
+
+Returns an action object used to set the fallback block name.
+
+*Parameters*
+
+ * name: Block name.
\ No newline at end of file
diff --git a/docs/data/core-edit-post.md b/docs/data/core-edit-post.md
new file mode 100644
index 0000000000000..be5e8acfe1c08
--- /dev/null
+++ b/docs/data/core-edit-post.md
@@ -0,0 +1,245 @@
+# **core/edit-post**: The Editor's UI Data
+
+## Selectors 
+
+### getEditorMode
+
+Returns the current editing mode.
+
+*Parameters*
+
+ * state: Global application state.
+
+### isEditorSidebarOpened
+
+Returns true if the editor sidebar is opened.
+
+*Parameters*
+
+ * state: Global application state
+
+*Returns*
+
+Whether the editor sidebar is opened.
+
+### isPluginSidebarOpened
+
+Returns true if the plugin sidebar is opened.
+
+*Parameters*
+
+ * state: Global application state
+
+*Returns*
+
+Whether the plugin sidebar is opened.
+
+### getActiveGeneralSidebarName
+
+Returns the current active general sidebar name.
+
+*Parameters*
+
+ * state: Global application state.
+
+*Returns*
+
+Active general sidebar name.
+
+### getPreferences
+
+Returns the preferences (these preferences are persisted locally).
+
+*Parameters*
+
+ * state: Global application state.
+
+*Returns*
+
+Preferences Object.
+
+### getPreference
+
+*Parameters*
+
+ * state: Global application state.
+ * preferenceKey: Preference Key.
+ * defaultValue: Default Value.
+
+*Returns*
+
+Preference Value.
+
+### isPublishSidebarOpened
+
+Returns true if the publish sidebar is opened.
+
+*Parameters*
+
+ * state: Global application state
+
+*Returns*
+
+Whether the publish sidebar is open.
+
+### isEditorSidebarPanelOpened
+
+Returns true if the editor sidebar panel is open, or false otherwise.
+
+*Parameters*
+
+ * state: Global application state.
+ * panel: Sidebar panel name.
+
+*Returns*
+
+Whether the sidebar panel is open.
+
+### isFeatureActive
+
+Returns whether the given feature is enabled or not.
+
+*Parameters*
+
+ * state: Global application state.
+ * feature: Feature slug.
+
+*Returns*
+
+Is active.
+
+### isPluginItemPinned
+
+Returns true if the the plugin item is pinned to the header.
+When the value is not set it defaults to true.
+
+*Parameters*
+
+ * state: Global application state.
+ * pluginName: Plugin item name.
+
+*Returns*
+
+Whether the plugin item is pinned.
+
+### getMetaBoxes
+
+Returns the state of legacy meta boxes.
+
+*Parameters*
+
+ * state: Global application state.
+
+*Returns*
+
+State of meta boxes.
+
+### getMetaBox
+
+Returns the state of legacy meta boxes.
+
+*Parameters*
+
+ * state: Global application state.
+ * location: Location of the meta box.
+
+*Returns*
+
+State of meta box at specified location.
+
+### isSavingMetaBoxes
+
+Returns true if the the Meta Boxes are being saved.
+
+*Parameters*
+
+ * state: Global application state.
+
+*Returns*
+
+Whether the metaboxes are being saved.
+
+## Actions
+
+### openGeneralSidebar
+
+Returns an action object used in signalling that the user opened an editor sidebar.
+
+*Parameters*
+
+ * name: Sidebar name to be opened.
+
+### closeGeneralSidebar
+
+Returns an action object signalling that the user closed the sidebar.
+
+### openPublishSidebar
+
+Returns an action object used in signalling that the user opened the publish
+sidebar.
+
+### closePublishSidebar
+
+Returns an action object used in signalling that the user closed the
+publish sidebar.
+
+### togglePublishSidebar
+
+Returns an action object used in signalling that the user toggles the publish sidebar.
+
+### toggleGeneralSidebarEditorPanel
+
+Returns an action object used in signalling that use toggled a panel in the editor.
+
+*Parameters*
+
+ * panel: The panel to toggle.
+
+### toggleFeature
+
+Returns an action object used to toggle a feature flag.
+
+*Parameters*
+
+ * feature: Feature name.
+
+### togglePinnedPluginItem
+
+Returns an action object used to toggle a plugin name flag.
+
+*Parameters*
+
+ * pluginName: Plugin name.
+
+### initializeMetaBoxState
+
+Returns an action object used to check the state of meta boxes at a location.
+
+This should only be fired once to initialize meta box state. If a meta box
+area is empty, this will set the store state to indicate that React should
+not render the meta box area.
+
+Example: metaBoxes = { side: true, normal: false }.
+
+This indicates that the sidebar has a meta box but the normal area does not.
+
+*Parameters*
+
+ * metaBoxes: Whether meta box locations are active.
+
+### requestMetaBoxUpdates
+
+Returns an action object used to request meta box update.
+
+### metaBoxUpdatesSuccess
+
+Returns an action object used signal a successfull meta box update.
+
+### setMetaBoxSavedData
+
+Returns an action object used to set the saved meta boxes data.
+This is used to check if the meta boxes have been touched when leaving the editor.
+
+*Parameters*
+
+ * dataPerLocation: Meta Boxes Data per location.
\ No newline at end of file
diff --git a/docs/data/core-editor.md b/docs/data/core-editor.md
new file mode 100644
index 0000000000000..87fed16d687bf
--- /dev/null
+++ b/docs/data/core-editor.md
@@ -0,0 +1,1382 @@
+# **core/editor**: The Editor's Data
+
+## Selectors 
+
+### hasEditorUndo
+
+Returns true if any past editor history snapshots exist, or false otherwise.
+
+*Parameters*
+
+ * state: Global application state.
+
+### hasEditorRedo
+
+Returns true if any future editor history snapshots exist, or false
+otherwise.
+
+*Parameters*
+
+ * state: Global application state.
+
+*Returns*
+
+Whether redo history exists.
+
+### isEditedPostNew
+
+Returns true if the currently edited post is yet to be saved, or false if
+the post has been saved.
+
+*Parameters*
+
+ * state: Global application state.
+
+*Returns*
+
+Whether the post is new.
+
+### isEditedPostDirty
+
+Returns true if there are unsaved values for the current edit session, or
+false if the editing state matches the saved or new post.
+
+*Parameters*
+
+ * state: Global application state.
+
+*Returns*
+
+Whether unsaved values exist.
+
+### isCleanNewPost
+
+Returns true if there are no unsaved values for the current edit session and if
+the currently edited post is new (and has never been saved before).
+
+*Parameters*
+
+ * state: Global application state.
+
+*Returns*
+
+Whether new post and unsaved values exist.
+
+### getCurrentPost
+
+Returns the post currently being edited in its last known saved state, not
+including unsaved edits. Returns an object containing relevant default post
+values if the post has not yet been saved.
+
+*Parameters*
+
+ * state: Global application state.
+
+*Returns*
+
+Post object.
+
+### getCurrentPostType
+
+Returns the post type of the post currently being edited.
+
+*Parameters*
+
+ * state: Global application state.
+
+*Returns*
+
+Post type.
+
+### getCurrentPostId
+
+Returns the ID of the post currently being edited, or null if the post has
+not yet been saved.
+
+*Parameters*
+
+ * state: Global application state.
+
+*Returns*
+
+ID of current post.
+
+### getCurrentPostRevisionsCount
+
+Returns the number of revisions of the post currently being edited.
+
+*Parameters*
+
+ * state: Global application state.
+
+*Returns*
+
+Number of revisions.
+
+### getCurrentPostLastRevisionId
+
+Returns the last revision ID of the post currently being edited,
+or null if the post has no revisions.
+
+*Parameters*
+
+ * state: Global application state.
+
+*Returns*
+
+ID of the last revision.
+
+### getPostEdits
+
+Returns any post values which have been changed in the editor but not yet
+been saved.
+
+*Parameters*
+
+ * state: Global application state.
+
+*Returns*
+
+Object of key value pairs comprising unsaved edits.
+
+### getEditedPostAttribute
+
+Returns a single attribute of the post being edited, preferring the unsaved
+edit if one exists, but falling back to the attribute for the last known
+saved state of the post.
+
+*Parameters*
+
+ * state: Global application state.
+ * attributeName: Post attribute name.
+
+*Returns*
+
+Post attribute value.
+
+### getEditedPostVisibility
+
+Returns the current visibility of the post being edited, preferring the
+unsaved value if different than the saved post. The return value is one of
+"private", "password", or "public".
+
+*Parameters*
+
+ * state: Global application state.
+
+*Returns*
+
+Post visibility.
+
+### isCurrentPostPending
+
+Returns true if post is pending review.
+
+*Parameters*
+
+ * state: Global application state.
+
+*Returns*
+
+Whether current post is pending review.
+
+### isCurrentPostPublished
+
+Return true if the current post has already been published.
+
+*Parameters*
+
+ * state: Global application state.
+
+*Returns*
+
+Whether the post has been published.
+
+### isCurrentPostScheduled
+
+Returns true if post is already scheduled.
+
+*Parameters*
+
+ * state: Global application state.
+
+*Returns*
+
+Whether current post is scheduled to be posted.
+
+### isEditedPostPublishable
+
+Return true if the post being edited can be published.
+
+*Parameters*
+
+ * state: Global application state.
+
+*Returns*
+
+Whether the post can been published.
+
+### isEditedPostSaveable
+
+Returns true if the post can be saved, or false otherwise. A post must
+contain a title, an excerpt, or non-empty content to be valid for save.
+
+*Parameters*
+
+ * state: Global application state.
+
+*Returns*
+
+Whether the post can be saved.
+
+### isEditedPostEmpty
+
+Returns true if the edited post has content. A post has content if it has at
+least one block or otherwise has a non-empty content property assigned.
+
+*Parameters*
+
+ * state: Global application state.
+
+*Returns*
+
+Whether post has content.
+
+### isEditedPostAutosaveable
+
+Returns true if the post can be autosaved, or false otherwise.
+
+*Parameters*
+
+ * state: Global application state.
+
+*Returns*
+
+Whether the post can be autosaved.
+
+### getAutosave
+
+Returns the current autosave, or null if one is not set (i.e. if the post
+has yet to be autosaved, or has been saved or published since the last
+autosave).
+
+*Parameters*
+
+ * state: Editor state.
+
+*Returns*
+
+Current autosave, if exists.
+
+### hasAutosave
+
+Returns the true if there is an existing autosave, otherwise false.
+
+*Parameters*
+
+ * state: Global application state.
+
+*Returns*
+
+Whether there is an existing autosave.
+
+### isEditedPostBeingScheduled
+
+Return true if the post being edited is being scheduled. Preferring the
+unsaved status values.
+
+*Parameters*
+
+ * state: Global application state.
+
+*Returns*
+
+Whether the post has been published.
+
+### getDocumentTitle
+
+Gets the document title to be used.
+
+*Parameters*
+
+ * state: Global application state.
+
+*Returns*
+
+Document title.
+
+### getEditedPostPreviewLink
+
+Returns a URL to preview the post being edited.
+
+*Parameters*
+
+ * state: Global application state.
+
+*Returns*
+
+Preview URL.
+
+### getBlockName
+
+Returns a block's name given its UID, or null if no block exists with the
+UID.
+
+*Parameters*
+
+ * state: Editor state.
+ * uid: Block unique ID.
+
+*Returns*
+
+Block name.
+
+### getBlockCount
+
+Returns the number of blocks currently present in the post.
+
+*Parameters*
+
+ * state: Global application state.
+ * rootUID: Optional root UID of block list.
+
+*Returns*
+
+Number of blocks in the post.
+
+### getBlockSelectionStart
+
+Returns the current block selection start. This value may be null, and it
+may represent either a singular block selection or multi-selection start.
+A selection is singular if its start and end match.
+
+*Parameters*
+
+ * state: Global application state.
+
+*Returns*
+
+UID of block selection start.
+
+### getBlockSelectionEnd
+
+Returns the current block selection end. This value may be null, and it
+may represent either a singular block selection or multi-selection end.
+A selection is singular if its start and end match.
+
+*Parameters*
+
+ * state: Global application state.
+
+*Returns*
+
+UID of block selection end.
+
+### getSelectedBlockCount
+
+Returns the number of blocks currently selected in the post.
+
+*Parameters*
+
+ * state: Global application state.
+
+*Returns*
+
+Number of blocks selected in the post.
+
+### hasSelectedBlock
+
+Returns true if there is a single selected block, or false otherwise.
+
+*Parameters*
+
+ * state: Editor state.
+
+*Returns*
+
+Whether a single block is selected.
+
+### getSelectedBlockUID
+
+Returns the currently selected block UID, or null if there is no selected
+block.
+
+*Parameters*
+
+ * state: Global application state.
+
+*Returns*
+
+Selected block UID.
+
+### getSelectedBlock
+
+Returns the currently selected block, or null if there is no selected block.
+
+*Parameters*
+
+ * state: Global application state.
+
+*Returns*
+
+Selected block.
+
+### getBlockRootUID
+
+Given a block UID, returns the root block from which the block is nested, an
+empty string for top-level blocks, or null if the block does not exist.
+
+*Parameters*
+
+ * state: Global application state.
+ * uid: Block from which to find root UID.
+
+*Returns*
+
+Root UID, if exists
+
+### getAdjacentBlockUid
+
+Returns the UID of the block adjacent one at the given reference startUID and modifier
+directionality. Defaults start UID to the selected block, and direction as
+next block. Returns null if there is no adjacent block.
+
+*Parameters*
+
+ * state: Global application state.
+ * startUID: Optional UID of block from which to search.
+ * modifier: Directionality multiplier (1 next, -1 previous).
+
+*Returns*
+
+Return the UID of the block, or null if none exists.
+
+### getPreviousBlockUid
+
+Returns the previous block's UID from the given reference startUID. Defaults start
+UID to the selected block. Returns null if there is no previous block.
+
+*Parameters*
+
+ * state: Global application state.
+ * startUID: Optional UID of block from which to search.
+
+*Returns*
+
+Adjacent block's UID, or null if none exists.
+
+### getNextBlockUid
+
+Returns the next block's UID from the given reference startUID. Defaults start UID
+to the selected block. Returns null if there is no next block.
+
+*Parameters*
+
+ * state: Global application state.
+ * startUID: Optional UID of block from which to search.
+
+*Returns*
+
+Adjacent block's UID, or null if none exists.
+
+### getSelectedBlocksInitialCaretPosition
+
+Returns the initial caret position for the selected block.
+This position is to used to position the caret properly when the selected block changes.
+
+*Parameters*
+
+ * state: Global application state.
+
+*Returns*
+
+Selected block.
+
+### getFirstMultiSelectedBlockUid
+
+Returns the unique ID of the first block in the multi-selection set, or null
+if there is no multi-selection.
+
+*Parameters*
+
+ * state: Global application state.
+
+*Returns*
+
+First unique block ID in the multi-selection set.
+
+### getLastMultiSelectedBlockUid
+
+Returns the unique ID of the last block in the multi-selection set, or null
+if there is no multi-selection.
+
+*Parameters*
+
+ * state: Global application state.
+
+*Returns*
+
+Last unique block ID in the multi-selection set.
+
+### isFirstMultiSelectedBlock
+
+Returns true if a multi-selection exists, and the block corresponding to the
+specified unique ID is the first block of the multi-selection set, or false
+otherwise.
+
+*Parameters*
+
+ * state: Global application state.
+ * uid: Block unique ID.
+
+*Returns*
+
+Whether block is first in mult-selection.
+
+### isBlockMultiSelected
+
+Returns true if the unique ID occurs within the block multi-selection, or
+false otherwise.
+
+*Parameters*
+
+ * state: Global application state.
+ * uid: Block unique ID.
+
+*Returns*
+
+Whether block is in multi-selection set.
+
+### getMultiSelectedBlocksStartUid
+
+Returns the unique ID of the block which begins the multi-selection set, or
+null if there is no multi-selection.
+
+N.b.: This is not necessarily the first uid in the selection. See
+getFirstMultiSelectedBlockUid().
+
+*Parameters*
+
+ * state: Global application state.
+
+*Returns*
+
+Unique ID of block beginning multi-selection.
+
+### getMultiSelectedBlocksEndUid
+
+Returns the unique ID of the block which ends the multi-selection set, or
+null if there is no multi-selection.
+
+N.b.: This is not necessarily the last uid in the selection. See
+getLastMultiSelectedBlockUid().
+
+*Parameters*
+
+ * state: Global application state.
+
+*Returns*
+
+Unique ID of block ending multi-selection.
+
+### getBlockOrder
+
+Returns an array containing all block unique IDs of the post being edited,
+in the order they appear in the post. Optionally accepts a root UID of the
+block list for which the order should be returned, defaulting to the top-
+level block order.
+
+*Parameters*
+
+ * state: Global application state.
+ * rootUID: Optional root UID of block list.
+
+*Returns*
+
+Ordered unique IDs of post blocks.
+
+### getBlockIndex
+
+Returns the index at which the block corresponding to the specified unique ID
+occurs within the post block order, or `-1` if the block does not exist.
+
+*Parameters*
+
+ * state: Global application state.
+ * uid: Block unique ID.
+ * rootUID: Optional root UID of block list.
+
+*Returns*
+
+Index at which block exists in order.
+
+### isBlockSelected
+
+Returns true if the block corresponding to the specified unique ID is
+currently selected and no multi-selection exists, or false otherwise.
+
+*Parameters*
+
+ * state: Global application state.
+ * uid: Block unique ID.
+
+*Returns*
+
+Whether block is selected and multi-selection exists.
+
+### hasSelectedInnerBlock
+
+Returns true if one of the block's inner blocks is selected.
+
+*Parameters*
+
+ * state: Global application state.
+ * uid: Block unique ID.
+
+*Returns*
+
+Whether the block as an inner block selected
+
+### isBlockWithinSelection
+
+Returns true if the block corresponding to the specified unique ID is
+currently selected but isn't the last of the selected blocks. Here "last"
+refers to the block sequence in the document, _not_ the sequence of
+multi-selection, which is why `state.blockSelection.end` isn't used.
+
+*Parameters*
+
+ * state: Global application state.
+ * uid: Block unique ID.
+
+*Returns*
+
+Whether block is selected and not the last in
+                   the selection.
+
+### hasMultiSelection
+
+Returns true if a multi-selection has been made, or false otherwise.
+
+*Parameters*
+
+ * state: Editor state.
+
+*Returns*
+
+Whether multi-selection has been made.
+
+### isMultiSelecting
+
+Whether in the process of multi-selecting or not. This flag is only true
+while the multi-selection is being selected (by mouse move), and is false
+once the multi-selection has been settled.
+
+*Parameters*
+
+ * state: Global application state.
+
+*Returns*
+
+True if multi-selecting, false if not.
+
+### isSelectionEnabled
+
+Whether is selection disable or not.
+
+*Parameters*
+
+ * state: Global application state.
+
+*Returns*
+
+True if multi is disable, false if not.
+
+### getBlockMode
+
+Returns thee block's editing mode.
+
+*Parameters*
+
+ * state: Global application state.
+ * uid: Block unique ID.
+
+*Returns*
+
+Block editing mode.
+
+### isTyping
+
+Returns true if the user is typing, or false otherwise.
+
+*Parameters*
+
+ * state: Global application state.
+
+*Returns*
+
+Whether user is typing.
+
+### getBlockInsertionPoint
+
+Returns the insertion point, the index at which the new inserted block would
+be placed. Defaults to the last index.
+
+*Parameters*
+
+ * state: Global application state.
+
+*Returns*
+
+Insertion point object with `rootUID`, `layout`, `index`
+
+### isBlockInsertionPointVisible
+
+Returns true if we should show the block insertion point.
+
+*Parameters*
+
+ * state: Global application state.
+
+*Returns*
+
+Whether the insertion point is visible or not.
+
+### isValidTemplate
+
+Returns whether the blocks matches the template or not.
+
+*Parameters*
+
+ * state: null
+
+*Returns*
+
+Whether the template is valid or not.
+
+### getTemplate
+
+Returns the defined block template
+
+*Parameters*
+
+ * state: null
+
+*Returns*
+
+Block Template
+
+### getTemplateLock
+
+Returns the defined block template lock
+
+*Parameters*
+
+ * state: null
+
+*Returns*
+
+Block Template Lock
+
+### isSavingPost
+
+Returns true if the post is currently being saved, or false otherwise.
+
+*Parameters*
+
+ * state: Global application state.
+
+*Returns*
+
+Whether post is being saved.
+
+### didPostSaveRequestSucceed
+
+Returns true if a previous post save was attempted successfully, or false
+otherwise.
+
+*Parameters*
+
+ * state: Global application state.
+
+*Returns*
+
+Whether the post was saved successfully.
+
+### didPostSaveRequestFail
+
+Returns true if a previous post save was attempted but failed, or false
+otherwise.
+
+*Parameters*
+
+ * state: Global application state.
+
+*Returns*
+
+Whether the post save failed.
+
+### isAutosavingPost
+
+Returns true if the post is autosaving, or false otherwise.
+
+*Parameters*
+
+ * state: Global application state.
+
+*Returns*
+
+Whether the post is autosaving.
+
+### getSuggestedPostFormat
+
+Returns a suggested post format for the current post, inferred only if there
+is a single block within the post and it is of a type known to match a
+default post format. Returns null if the format cannot be determined.
+
+*Parameters*
+
+ * state: Global application state.
+
+*Returns*
+
+Suggested post format.
+
+### getNotices
+
+Returns the user notices array.
+
+*Parameters*
+
+ * state: Global application state.
+
+*Returns*
+
+List of notices.
+
+### getFrecentInserterItems
+
+Returns a list of items which the user is likely to want to insert. These
+are ordered by 'frecency', which is a heuristic that combines block usage
+frequency and recency.
+
+https://en.wikipedia.org/wiki/Frecency
+
+*Parameters*
+
+ * state: Global application state.
+ * allowedBlockTypes: Allowed block types, or true/false to enable/disable all types.
+ * maximum: Number of items to return.
+
+*Returns*
+
+Items that appear in the 'Recent' tab.
+
+### isSavingSharedBlock
+
+Returns whether or not the shared block with the given ID is being saved.
+
+*Parameters*
+
+ * state: Global application state.
+ * ref: The shared block's ID.
+
+*Returns*
+
+Whether or not the shared block is being saved.
+
+### isFetchingSharedBlock
+
+Returns true if the shared block with the given ID is being fetched, or
+false otherwise.
+
+*Parameters*
+
+ * state: Global application state.
+ * ref: The shared block's ID.
+
+*Returns*
+
+Whether the shared block is being fetched.
+
+### getSharedBlocks
+
+Returns an array of all shared blocks.
+
+*Parameters*
+
+ * state: Global application state.
+
+*Returns*
+
+An array of all shared blocks.
+
+### getStateBeforeOptimisticTransaction
+
+Returns state object prior to a specified optimist transaction ID, or `null`
+if the transaction corresponding to the given ID cannot be found.
+
+*Parameters*
+
+ * state: Current global application state.
+ * transactionId: Optimist transaction ID.
+
+*Returns*
+
+Global application state prior to transaction.
+
+### isPublishingPost
+
+Returns true if the post is being published, or false otherwise.
+
+*Parameters*
+
+ * state: Global application state.
+
+*Returns*
+
+Whether post is being published.
+
+### getProvisionalBlockUID
+
+Returns the provisional block UID, or null if there is no provisional block.
+
+*Parameters*
+
+ * state: Editor state.
+
+*Returns*
+
+Provisional block UID, if set.
+
+### isPermalinkEditable
+
+Returns whether the permalink is editable or not.
+
+*Parameters*
+
+ * state: Editor state.
+
+*Returns*
+
+Whether or not the permalink is editable.
+
+### getPermalink
+
+Returns the permalink for the post.
+
+*Parameters*
+
+ * state: Editor state.
+
+*Returns*
+
+The permalink.
+
+### getPermalinkParts
+
+Returns the permalink for a post, split into it's three parts: the prefix, the postName, and the suffix.
+
+*Parameters*
+
+ * state: Editor state.
+
+*Returns*
+
+The prefix, postName, and suffix for the permalink.
+
+### inSomeHistory
+
+Returns true if an optimistic transaction is pending commit, for which the
+before state satisfies the given predicate function.
+
+*Parameters*
+
+ * state: Editor state.
+ * predicate: Function given state, returning true if match.
+
+*Returns*
+
+Whether predicate matches for some history.
+
+### getBlockListSettings
+
+Returns the Block List settings of a block if any.
+
+*Parameters*
+
+ * state: Editor state.
+ * uid: Block UID.
+
+*Returns*
+
+Block settings of the block if set.
+
+### getSupportedBlocks
+
+eslint-disable-next-line no-unused-vars
+
+### getEditorSettings
+
+Returns the editor settings.
+
+*Parameters*
+
+ * state: Editor state.
+
+*Returns*
+
+The editor settings object
+
+## Actions
+
+### setupEditor
+
+Returns an action object used in signalling that editor has initialized with
+the specified post object and editor settings.
+
+*Parameters*
+
+ * post: Post object.
+ * autosaveStatus: The Post's autosave status.
+
+### resetPost
+
+Returns an action object used in signalling that the latest version of the
+post has been received, either by initialization or save.
+
+*Parameters*
+
+ * post: Post object.
+
+### resetAutosave
+
+Returns an action object used in signalling that the latest autosave of the
+post has been received, by initialization or autosave.
+
+*Parameters*
+
+ * post: Autosave post object.
+
+### setupEditorState
+
+Returns an action object used to setup the editor state when first opening an editor.
+
+*Parameters*
+
+ * post: Post object.
+ * blocks: Array of blocks.
+ * edits: Initial edited attributes object.
+
+### resetBlocks
+
+Returns an action object used in signalling that blocks state should be
+reset to the specified array of blocks, taking precedence over any other
+content reflected as an edit in state.
+
+*Parameters*
+
+ * blocks: Array of blocks.
+
+### receiveBlocks
+
+Returns an action object used in signalling that blocks have been received.
+Unlike resetBlocks, these should be appended to the existing known set, not
+replacing.
+
+*Parameters*
+
+ * blocks: Array of block objects.
+
+### updateBlockAttributes
+
+Returns an action object used in signalling that the block attributes with
+the specified UID has been updated.
+
+*Parameters*
+
+ * uid: Block UID.
+ * attributes: Block attributes to be merged.
+
+### updateBlock
+
+Returns an action object used in signalling that the block with the
+specified UID has been updated.
+
+*Parameters*
+
+ * uid: Block UID.
+ * updates: Block attributes to be merged.
+
+### toggleSelection
+
+Returns an action object that enables or disables block selection.
+
+*Parameters*
+
+ * boolean: [isSelectionEnabled=true] Whether block selection should
+                                           be enabled.
+
+### replaceBlocks
+
+Returns an action object signalling that a blocks should be replaced with
+one or more replacement blocks.
+
+*Parameters*
+
+ * uids: Block UID(s) to replace.
+ * blocks: Replacement block(s).
+
+### replaceBlock
+
+Returns an action object signalling that a single block should be replaced
+with one or more replacement blocks.
+
+*Parameters*
+
+ * uid: Block UID(s) to replace.
+ * block: Replacement block(s).
+
+### moveBlockToPosition
+
+Returns an action object signalling that an indexed block should be moved
+to a new index.
+
+*Parameters*
+
+ * uid: The UID of the block.
+ * fromRootUID: root UID source.
+ * toRootUID: root UID destination.
+ * layout: layout to move the block into.
+ * index: The index to move the block into.
+
+### insertBlock
+
+Returns an action object used in signalling that a single block should be
+inserted, optionally at a specific index respective a root block list.
+
+*Parameters*
+
+ * block: Block object to insert.
+ * index: Index at which block should be inserted.
+ * rootUID: Optional root UID of block list to insert.
+
+### insertBlocks
+
+Returns an action object used in signalling that an array of blocks should
+be inserted, optionally at a specific index respective a root block list.
+
+*Parameters*
+
+ * blocks: Block objects to insert.
+ * index: Index at which block should be inserted.
+ * rootUID: Optional root UID of block list to insert.
+
+### showInsertionPoint
+
+Returns an action object used in signalling that the insertion point should
+be shown.
+
+### hideInsertionPoint
+
+Returns an action object hiding the insertion point.
+
+### setTemplateValidity
+
+Returns an action object resetting the template validity.
+
+*Parameters*
+
+ * isValid: template validity flag.
+
+### checkTemplateValidity
+
+Returns an action object to check the template validity.
+
+### synchronizeTemplate
+
+Returns an action object synchronize the template with the list of blocks
+
+### savePost
+
+Returns an action object to save the post.
+
+*Parameters*
+
+ * options: Options for the save.
+ * options.autosave: Perform an autosave if true.
+
+### mergeBlocks
+
+Returns an action object used in signalling that two blocks should be merged
+
+*Parameters*
+
+ * blockAUid: UID of the first block to merge.
+ * blockBUid: UID of the second block to merge.
+
+### autosave
+
+Returns an action object used in signalling that the post should autosave.
+
+### redo
+
+Returns an action object used in signalling that undo history should
+restore last popped state.
+
+### undo
+
+Returns an action object used in signalling that undo history should pop.
+
+### createUndoLevel
+
+Returns an action object used in signalling that undo history record should
+be created.
+
+### removeBlocks
+
+Returns an action object used in signalling that the blocks
+corresponding to the specified UID set are to be removed.
+
+*Parameters*
+
+ * uids: Block UIDs.
+ * selectPrevious: True if the previous block should be selected when a block is removed.
+
+### removeBlock
+
+Returns an action object used in signalling that the block with the
+specified UID is to be removed.
+
+*Parameters*
+
+ * uid: Block UID.
+ * selectPrevious: True if the previous block should be selected when a block is removed.
+
+### toggleBlockMode
+
+Returns an action object used to toggle the block editing mode (visual/html).
+
+*Parameters*
+
+ * uid: Block UID.
+
+### startTyping
+
+Returns an action object used in signalling that the user has begun to type.
+
+### stopTyping
+
+Returns an action object used in signalling that the user has stopped typing.
+
+### createNotice
+
+Returns an action object used to create a notice.
+
+*Parameters*
+
+ * status: The notice status.
+ * content: The notice content.
+ * options: The notice options.  Available options:
+                             `id` (string; default auto-generated)
+                             `isDismissible` (boolean; default `true`).
+
+### removeNotice
+
+Returns an action object used to remove a notice.
+
+*Parameters*
+
+ * id: The notice id.
+
+### fetchSharedBlocks
+
+Returns an action object used to fetch a single shared block or all shared
+blocks from the REST API into the store.
+
+*Parameters*
+
+ * id: If given, only a single shared block with this ID will
+                    be fetched.
+
+### receiveSharedBlocks
+
+Returns an action object used in signalling that shared blocks have been
+received. `results` is an array of objects containing:
+ - `sharedBlock` - Details about how the shared block is persisted.
+ - `parsedBlock` - The original block.
+
+*Parameters*
+
+ * results: Shared blocks received.
+
+### saveSharedBlock
+
+Returns an action object used to save a shared block that's in the store to
+the REST API.
+
+*Parameters*
+
+ * id: The ID of the shared block to save.
+
+### deleteSharedBlock
+
+Returns an action object used to delete a shared block via the REST API.
+
+*Parameters*
+
+ * id: The ID of the shared block to delete.
+
+### updateSharedBlockTitle
+
+Returns an action object used in signalling that a shared block's title is
+to be updated.
+
+*Parameters*
+
+ * id: The ID of the shared block to update.
+ * title: The new title.
+
+### convertBlockToStatic
+
+Returns an action object used to convert a shared block into a static block.
+
+*Parameters*
+
+ * uid: The ID of the block to attach.
+
+### convertBlockToShared
+
+Returns an action object used to convert a static block into a shared block.
+
+*Parameters*
+
+ * uid: The ID of the block to detach.
+
+### insertDefaultBlock
+
+Returns an action object used in signalling that a new block of the default
+type should be added to the block list.
+
+*Parameters*
+
+ * attributes: Optional attributes of the block to assign.
+ * rootUID: Optional root UID of block list to append.
+ * index: Optional index where to insert the default block
+
+### updateBlockListSettings
+
+Returns an action object that changes the nested settings of a given block.
+
+*Parameters*
+
+ * id: UID of the block whose nested setting.
+ * settings: Object with the new settings for the nested block.
+
+### updateEditorSettings
+
+Returns an action object used in signalling that the editor settings have been updated.
+
+*Parameters*
+
+ * settings: Updated settings
diff --git a/docs/data/core-nux.md b/docs/data/core-nux.md
new file mode 100644
index 0000000000000..7da5192f596ad
--- /dev/null
+++ b/docs/data/core-nux.md
@@ -0,0 +1,39 @@
+# **core/nux**: The NUX module Data
+
+## Selectors 
+
+### isTipVisible
+
+Determines whether or not the given tip is showing. Tips are hidden if they
+are disabled, have been dismissed, or are not the current tip in any
+guide that they have been added to.
+
+*Parameters*
+
+ * state: Global application state.
+ * id: The tip to query.
+
+## Actions
+
+### triggerGuide
+
+Returns an action object that, when dispatched, presents a guide that takes
+the user through a series of tips step by step.
+
+*Parameters*
+
+ * tipIds: Which tips to show in the guide.
+
+### dismissTip
+
+Returns an action object that, when dispatched, dismisses the given tip. A
+dismissed tip will not show again.
+
+*Parameters*
+
+ * id: The tip to dismiss.
+
+### disableTips
+
+Returns an action object that, when dispatched, prevents all tips from
+showing again.
\ No newline at end of file
diff --git a/docs/data/core-viewport.md b/docs/data/core-viewport.md
new file mode 100644
index 0000000000000..32e804dcda70e
--- /dev/null
+++ b/docs/data/core-viewport.md
@@ -0,0 +1,25 @@
+# **core/viewport**: The viewport module Data
+
+## Selectors 
+
+### isViewportMatch
+
+Returns true if the viewport matches the given query, or false otherwise.
+
+*Parameters*
+
+ * state: Viewport state object.
+ * query: Query string. Includes operator and breakpoint name,
+                      space separated. Operator defaults to >=.
+
+## Actions
+
+### setIsMatching
+
+Returns an action object used in signalling that viewport queries have been
+updated. Values are specified as an object of breakpoint query keys where
+value represents whether query matches.
+
+*Parameters*
+
+ * values: Breakpoint query matches.
\ No newline at end of file
diff --git a/docs/data/core.md b/docs/data/core.md
new file mode 100644
index 0000000000000..433923d409088
--- /dev/null
+++ b/docs/data/core.md
@@ -0,0 +1,164 @@
+# **core**: WordPress Core Data
+
+## Selectors 
+
+### getTerms
+
+Returns all the available terms for the given taxonomy.
+
+*Parameters*
+
+ * state: Data state.
+ * taxonomy: Taxonomy name.
+
+### getCategories
+
+Returns all the available categories.
+
+*Parameters*
+
+ * state: Data state.
+
+*Returns*
+
+Categories list.
+
+### isRequestingTerms
+
+Returns true if a request is in progress for terms data of a given taxonomy,
+or false otherwise.
+
+*Parameters*
+
+ * state: Data state.
+ * taxonomy: Taxonomy name.
+
+*Returns*
+
+Whether a request is in progress for taxonomy's terms.
+
+### isRequestingCategories
+
+Returns true if a request is in progress for categories data, or false
+otherwise.
+
+*Parameters*
+
+ * state: Data state.
+
+*Returns*
+
+Whether a request is in progress for categories.
+
+### getAuthors
+
+Returns all available authors.
+
+*Parameters*
+
+ * state: Data state.
+
+*Returns*
+
+Authors list.
+
+### getEntitiesByKind
+
+Returns whether the entities for the give kind are loaded.
+
+*Parameters*
+
+ * state: Data state.
+ * kind: Entity kind.
+
+*Returns*
+
+Whether the entities are loaded
+
+### getEntity
+
+Returns the entity object given its kind and name.
+
+*Parameters*
+
+ * state: Data state.
+ * kind: Entity kind.
+ * name: Entity name.
+
+*Returns*
+
+Entity
+
+### getEntityRecord
+
+Returns the Entity's record object by key.
+
+*Parameters*
+
+ * state: State tree
+ * kind: Entity kind.
+ * name: Entity name.
+ * key: Record's key
+
+*Returns*
+
+Record.
+
+### getThemeSupports
+
+Return theme suports data in the index.
+
+*Parameters*
+
+ * state: Data state.
+
+*Returns*
+
+Index data.
+
+## Actions
+
+### receiveTerms
+
+Returns an action object used in signalling that terms have been received
+for a given taxonomy.
+
+*Parameters*
+
+ * taxonomy: Taxonomy name.
+ * terms: Terms received.
+
+### receiveUserQuery
+
+Returns an action object used in signalling that authors have been received.
+
+*Parameters*
+
+ * queryID: Query ID.
+ * users: Users received.
+
+### addEntities
+
+Returns an action object used in adding new entities.
+
+*Parameters*
+
+ * entities: Entities received.
+
+### receiveEntityRecords
+
+Returns an action object used in signalling that entity records have been received.
+
+*Parameters*
+
+ * kind: Kind of the received entity.
+ * name: Name of the received entity.
+ * records: Records received.
+
+### receiveThemeSupportsFromIndex
+
+Returns an action object used in signalling that the index has been received.
+
+*Parameters*
+
+ * index: Index received.
\ No newline at end of file
diff --git a/docs/data/index.md b/docs/data/index.md
new file mode 100644
index 0000000000000..acd84a70f4e42
--- /dev/null
+++ b/docs/data/index.md
@@ -0,0 +1,8 @@
+# Data Module Reference
+
+ - [**core**: WordPress Core Data](./core.md)
+ - [**core/blocks**: Block Types Data](./core-blocks.md)
+ - [**core/editor**: The Editor's Data](./core-editor.md)
+ - [**core/edit-post**: The Editor's UI Data](./core-edit-post.md)
+ - [**core/viewport**: The viewport module Data](./core-viewport.md)
+ - [**core/nux**: The NUX module Data](./core-nux.md)
\ No newline at end of file
diff --git a/docs/data/tool/config.js b/docs/data/tool/config.js
new file mode 100644
index 0000000000000..ef755ea4ebd11
--- /dev/null
+++ b/docs/data/tool/config.js
@@ -0,0 +1,44 @@
+/**
+ * Node dependencies
+ */
+const path = require( 'path' );
+
+const root = path.resolve( __dirname, '../../../' );
+
+module.exports = {
+	namespaces: {
+		core: {
+			title: 'WordPress Core Data',
+			// TODO: Figure out a way to generate docs for dynamic actions/selectors
+			selectors: [ path.resolve( root, 'packages/core-data/src/selectors.js' ) ],
+			actions: [ path.resolve( root, 'packages/core-data/src/actions.js' ) ],
+		},
+		'core/blocks': {
+			title: 'Block Types Data',
+			selectors: [ path.resolve( root, 'blocks/store/selectors.js' ) ],
+			actions: [ path.resolve( root, 'blocks/store/actions.js' ) ],
+		},
+		'core/editor': {
+			title: 'The Editor\'s Data',
+			selectors: [ path.resolve( root, 'editor/store/selectors.js' ) ],
+			actions: [ path.resolve( root, 'editor/store/actions.js' ) ],
+		},
+		'core/edit-post': {
+			title: 'The Editor\'s UI Data',
+			selectors: [ path.resolve( root, 'edit-post/store/selectors.js' ) ],
+			actions: [ path.resolve( root, 'edit-post/store/actions.js' ) ],
+		},
+		'core/viewport': {
+			title: 'The viewport module Data',
+			selectors: [ path.resolve( root, 'viewport/store/selectors.js' ) ],
+			actions: [ path.resolve( root, 'viewport/store/actions.js' ) ],
+		},
+		'core/nux': {
+			title: 'The NUX (New User Experience) module Data',
+			selectors: [ path.resolve( root, 'nux/store/selectors.js' ) ],
+			actions: [ path.resolve( root, 'nux/store/actions.js' ) ],
+		},
+	},
+
+	output: path.resolve( __dirname, '../' ),
+};
diff --git a/docs/data/tool/generator.js b/docs/data/tool/generator.js
new file mode 100644
index 0000000000000..63869c67872e2
--- /dev/null
+++ b/docs/data/tool/generator.js
@@ -0,0 +1,94 @@
+/**
+ * Node dependencies
+ */
+const path = require( 'path' );
+const fs = require( 'fs' );
+const lodash = require( 'lodash' );
+
+/**
+ * Generates the table of contents' markdown.
+ *
+ * @param {Object} parsedNamespaces Parsed Namespace Object
+ *
+ * @return {string} Markdown string
+ */
+function generateTableOfContent( parsedNamespaces ) {
+	return [
+		'# Data Module Reference',
+		'',
+		Object.values( parsedNamespaces ).map( ( parsedNamespace ) => {
+			return ` - [**${ parsedNamespace.name }**: ${ parsedNamespace.title }](./${ lodash.kebabCase( parsedNamespace.name ) }.md)`;
+		} ).join( '\n' ),
+	].join( '\n' );
+}
+
+/**
+ * Generates the table of contents' markdown.
+ *
+ * @param {Object}  parsedFunc            Parsed Function
+ * @param {boolean} generateDocsForReturn Whether to generate docs for the return value.
+ *
+ * @return {string} Markdown string
+ */
+function generateFunctionDocs( parsedFunc, generateDocsForReturn = true ) {
+	return [
+		`### ${ parsedFunc.name }`,
+		parsedFunc.description ? [
+			'',
+			parsedFunc.description,
+		].join( '\n' ) : null,
+		parsedFunc.params.length ? [
+			'',
+			'*Parameters*',
+			'',
+			parsedFunc.params.map( ( param ) => (
+				` * ${ param.name }: ${ param.description }`
+			) ).join( '\n' ),
+		].join( '\n' ) : null,
+		parsedFunc.return && generateDocsForReturn ? [
+			'',
+			'*Returns*',
+			'',
+			parsedFunc.return.description,
+		].join( '\n' ) : null,
+	].filter( ( row ) => row !== null ).join( '\n' );
+}
+
+/**
+ * Generates the namespace selectors/actions markdown.
+ *
+ * @param {Object} parsedNamespace Parsed Namespace
+ *
+ * @return {string} Markdown string
+ */
+function generateNamespaceDocs( parsedNamespace ) {
+	return [
+		`# **${ parsedNamespace.name }**: ${ parsedNamespace.title }`,
+		'',
+		'## Selectors ',
+		'',
+		( parsedNamespace.selectors.map( generateFunctionDocs ) ).join( '\n\n' ),
+		'',
+		'## Actions',
+		'',
+		parsedNamespace.actions.map(
+			( action ) => generateFunctionDocs( action, false )
+		).join( '\n\n' ),
+	].join( '\n' );
+}
+
+module.exports = function( parsedNamespaces, rootFolder ) {
+	const tableOfContent = generateTableOfContent( parsedNamespaces );
+	fs.writeFileSync(
+		path.join( rootFolder, 'index.md' ),
+		tableOfContent
+	);
+
+	Object.values( parsedNamespaces ).forEach( ( parsedNamespace ) => {
+		const namespaceDocs = generateNamespaceDocs( parsedNamespace );
+		fs.writeFileSync(
+			path.join( rootFolder, lodash.kebabCase( parsedNamespace.name ) + '.md' ),
+			namespaceDocs
+		);
+	} );
+};
diff --git a/docs/data/tool/index.js b/docs/data/tool/index.js
new file mode 100644
index 0000000000000..7fd22fbb77024
--- /dev/null
+++ b/docs/data/tool/index.js
@@ -0,0 +1,9 @@
+/**
+ * Internal dependencies
+ */
+const config = require( './config' );
+const parser = require( './parser' );
+const generator = require( './generator' );
+
+const parsedModules = parser( config.namespaces );
+generator( parsedModules, config.output );
diff --git a/docs/data/tool/parser.js b/docs/data/tool/parser.js
new file mode 100644
index 0000000000000..ab719d8f4d3dd
--- /dev/null
+++ b/docs/data/tool/parser.js
@@ -0,0 +1,61 @@
+/**
+ * Node dependencies
+ */
+const fs = require( 'fs' );
+
+/**
+ * External dependencies
+ */
+const lodash = require( 'lodash' );
+const espree = require( 'espree' );
+const doctrine = require( 'doctrine' );
+
+module.exports = function( config ) {
+	const result = {};
+	Object.entries( config ).forEach( ( [ namespace, namespaceConfig ] ) => {
+		const namespaceResult = {
+			name: namespace,
+			title: namespaceConfig.title,
+			selectors: [],
+			actions: [],
+		};
+
+		[ 'selectors', 'actions' ].forEach( ( type ) => {
+			namespaceConfig[ type ].forEach( ( file ) => {
+				const code = fs.readFileSync( file, 'utf8' );
+				const parsedCode = espree.parse( code, {
+					attachComment: true,
+					// This should ideally match our babel config, but espree doesn't support it.
+					ecmaVersion: 9,
+					sourceType: 'module',
+				} );
+
+				parsedCode.body.forEach( ( node ) => {
+					if (
+						node.type === 'ExportNamedDeclaration' &&
+						node.declaration.type === 'FunctionDeclaration' &&
+						node.leadingComments &&
+						node.leadingComments.length !== 0
+					) {
+						const docBlock = doctrine.parse(
+							lodash.last( node.leadingComments ).value,
+							{ unwrap: true, recoverable: true }
+						);
+						const func = {
+							name: node.declaration.id.name,
+							description: docBlock.description,
+							params: docBlock.tags.filter( ( tag ) => tag.title === 'param' ),
+							return: docBlock.tags.find( ( tag ) => tag.title === 'return' ),
+						};
+
+						namespaceResult[ type ].push( func );
+					}
+				} );
+			} );
+		} );
+
+		result[ namespace ] = namespaceResult;
+	} );
+
+	return result;
+};
diff --git a/docs/extensibility.md b/docs/extensibility.md
index 9e3a33ebda8ea..561eb7f9f1694 100644
--- a/docs/extensibility.md
+++ b/docs/extensibility.md
@@ -37,7 +37,7 @@ Learn more in the [Extending Blocks](../docs/extensibility/extending-blocks.md)
 
 Extending the editor UI can be accomplished with the `registerPlugin` API, allowing you to define all your plugin's UI elements in one place.
 
-Refer to the [Plugins](https://github.com/WordPress/gutenberg/blob/master/plugins/README.md) and [Edit Post](https://github.com/WordPress/gutenberg/blob/master/edit-post/README.md) section for more information.
+Refer to the [Plugins](https://github.com/WordPress/gutenberg/blob/master/packages/plugins/README.md) and [Edit Post](https://github.com/WordPress/gutenberg/blob/master/edit-post/README.md) section for more information.
 
 ## Meta Boxes
 
diff --git a/docs/extensibility/autocomplete.md b/docs/extensibility/autocomplete.md
index 914c35af5c229..ee1f2bc945852 100644
--- a/docs/extensibility/autocomplete.md
+++ b/docs/extensibility/autocomplete.md
@@ -1,13 +1,13 @@
 Autocomplete
 ============
 
-Gutenberg provides a `blocks.Autocomplete.completers` filter for extending and overriding the list of autocompleters used by blocks.
+Gutenberg provides a `editor.Autocomplete.completers` filter for extending and overriding the list of autocompleters used by blocks.
 
 The `Autocomplete` component found in `@wordpress/editor` applies this filter. The `@wordpress/components` package provides the foundational `Autocomplete` component that does not apply such a filter, but blocks should generally use the component provided by `@wordpress/editor`.
 
 ### Example
 
-Here is an example of using the `blocks.Autocomplete.completers` filter to add an acronym completer. You can find full documentation for the autocompleter interface with the `Autocomplete` component in the `@wordpress/components` package.
+Here is an example of using the `editor.Autocomplete.completers` filter to add an acronym completer. You can find full documentation for the autocompleter interface with the `Autocomplete` component in the `@wordpress/components` package.
 
 {% codetabs %}
 {% ES5 %}
@@ -46,7 +46,7 @@ function appendAcronymCompleter( completers, blockName ) {
 
 // Adding the filter
 wp.hooks.addFilter(
-	'blocks.Autocomplete.completers',
+	'editor.Autocomplete.completers',
 	'my-plugin/autocompleters/acronyms',
 	appendAcronymCompleter
 );
@@ -81,7 +81,7 @@ function appendAcronymCompleter( completers, blockName ) {
 
 // Adding the filter
 wp.hooks.addFilter(
-	'blocks.Autocomplete.completers',
+	'editor.Autocomplete.completers',
 	'my-plugin/autocompleters/acronym',
 	appendAcronymCompleter
 );
diff --git a/docs/extensibility/extending-blocks.md b/docs/extensibility/extending-blocks.md
index c0579171bf3af..8447aaed5cb7e 100644
--- a/docs/extensibility/extending-blocks.md
+++ b/docs/extensibility/extending-blocks.md
@@ -10,10 +10,6 @@ To modify the behavior of existing blocks, Gutenberg exposes the following Filte
 
 Used to filter the block settings. It receives the block settings and the name of the block the registered block as arguments.
 
-#### `blocks.BlockEdit`
-
-Used to modify the block's `edit` component. It receives the original block `edit` component and returns a new wrapped component.
-
 #### `blocks.getSaveElement`
 
 A filter that applies to the result of a block's `save` function. This filter is used to replace or extend the element, for example using `wp.element.cloneElement` to modify the element's props or replace its children, or returning an entirely new element.
@@ -70,6 +66,75 @@ Used internally by the default block (paragraph) to exclude the attributes from
 
 Used to filters an individual transform result from block transformation. All of the original blocks are passed, since transformations are many-to-many, not one-to-one.
 
+#### `editor.BlockEdit`
+
+Used to modify the block's `edit` component. It receives the original block `BlockEdit` component and returns a new wrapped component.
+
+_Example:_
+
+```js
+var el = wp.element.createElement;
+
+var withInspectorControls = wp.element.createHigherOrderComponent( function( BlockEdit ) {
+	return function( props ) {
+		return el(
+			wp.element.Fragment,
+			{},
+			el(
+				BlockEdit,
+				props
+			),
+			el(
+				wp.editor.InspectorControls,
+				{},
+				el(
+					wp.components.PanelBody,
+					{},
+					'My custom control'
+				)
+			)
+		);
+	};
+}, 'withInspectorControls' );
+
+wp.hooks.addFilter( 'editor.BlockEdit', 'my-plugin/with-inspector-controls', withInspectorControls );
+```
+
+#### `editor.BlockListBlock`
+
+Used to modify the block's wrapper component containing the block's `edit` component and all toolbars. It receives the original `BlockListBlock` component and returns a new wrapped component.
+
+_Example:_
+
+```js
+var el = wp.element.createElement;
+
+var withDataAlign = wp.element.createHigherOrderComponent( function( BlockListBlock ) {
+	return function( props ) {
+		var newProps = Object.assign(
+			{},
+			props,
+			{
+				wrapperProps: Object.assign(
+					{},
+					props.wrapperProps,
+					{
+						'data-align': props.block.attributes.align
+					}
+				)
+			}
+		);
+
+		return el(
+			BlockListBlock,
+			newProps
+		);
+	};
+}, 'withAlign' );
+
+wp.hooks.addFilter( 'editor.BlockListBlock', 'my-plugin/with-data-align', withDataAlign );
+```
+
 ## Removing Blocks
 
 ### Using a blacklist
diff --git a/docs/reference/deprecated.md b/docs/reference/deprecated.md
index 3d142ab420c87..d93eab0a96c84 100644
--- a/docs/reference/deprecated.md
+++ b/docs/reference/deprecated.md
@@ -1,16 +1,22 @@
 Gutenberg's deprecation policy is intended to support backwards-compatibility for two minor releases, when possible. The current deprecations are listed below and are grouped by _the version at which they will be removed completely_. If your plugin depends on these behaviors, you must update to the recommended alternative before the noted version.
 
 ## 3.3.0
+
  - `useOnce: true` has been removed from the Block API. Please use `supports.multiple: false` instead.
+ - Serializing components using `componentWillMount` lifecycle method. Please use the constructor instead.
+ - `blocks.Autocomplete.completers` filter removed. Please use `editor.Autocomplete.completers` instead.
+ - `blocks.BlockEdit` filter removed. Please use `editor.BlockEdit` instead.
+ - `blocks.BlockListBlock` filter removed. Please use `editor.BlockListBlock` instead.
+ - `blocks.MediaUpload` filter removed. Please use `editor.MediaUpload` instead.
 
 ## 3.2.0
 
  - `wp.data.withRehydratation` has been renamed to `wp.data.withRehydration`.
  - The `wp.editor.ImagePlaceholder` component is removed. Please use `wp.editor.MediaPlaceholder` instead.
  - `wp.utils.deprecated` function removed. Please use `wp.deprecated` instead.
-- `getInserterItems`: the `allowedBlockTypes` argument was removed and the `parentUID` argument was added.
-- `getFrecentInserterItems` selector removed. Please use `getInserterItems` instead.
-- `getSupportedBlocks` selector removed. Please use `canInsertBlockType` instead.
+ - `getInserterItems`: the `allowedBlockTypes` argument was removed and the `parentUID` argument was added.
+ - `getFrecentInserterItems` selector removed. Please use `getInserterItems` instead.
+ - `getSupportedBlocks` selector removed. Please use `canInsertBlockType` instead.
 
 ## 3.1.0
 
@@ -18,22 +24,23 @@ Gutenberg's deprecation policy is intended to support backwards-compatibility fo
  - `wp.blocks.withEditorSettings` is removed. Please use the data module to access the editor settings `wp.data.select( "core/editor" ).getEditorSettings()`.
  - All DOM utils in `wp.utils.*` are removed. Please use `wp.dom.*` instead.
  - `isPrivate: true` has been removed from the Block API. Please use `supports.inserter: false` instead.
- - `wp.utils.isExtraSmall` function removed. Please use `wp.viewport.isExtraSmall` instead.
+ - `wp.utils.isExtraSmall` function removed. Please use `wp.viewport` module instead.
+ - `getEditedPostExcerpt` selector removed (`core/editor`). Use `getEditedPostAttribute( 'excerpt' )` instead.
 
 ## 3.0.0
 
-- `wp.blocks.registerCoreBlocks` function removed. Please use `wp.coreBlocks.registerCoreBlocks` instead.
-- Raw TinyMCE event handlers for `RichText` have been deprecated. Please use [documented props](https://wordpress.org/gutenberg/handbook/block-api/rich-text-api/), ancestor event handler, or onSetup access to the internal editor instance event hub instead.
+ - `wp.blocks.registerCoreBlocks` function removed. Please use `wp.coreBlocks.registerCoreBlocks` instead.
+ - Raw TinyMCE event handlers for `RichText` have been deprecated. Please use [documented props](https://wordpress.org/gutenberg/handbook/block-api/rich-text-api/), ancestor event handler, or onSetup access to the internal editor instance event hub instead.
 
 ## 2.8.0
 
-- `Original autocompleter interface in wp.components.Autocomplete` updated. Please use `latest autocompleter interface` instead. See: https://github.com/WordPress/gutenberg/blob/master/components/autocomplete/README.md.
-- `getInserterItems`: the `allowedBlockTypes` argument is now mandatory.
-- `getFrecentInserterItems`: the `allowedBlockTypes` argument is now mandatory.
+ - `Original autocompleter interface in wp.components.Autocomplete` updated. Please use `latest autocompleter interface` instead. See: https://github.com/WordPress/gutenberg/blob/master/components/autocomplete/README.md.
+ - `getInserterItems`: the `allowedBlockTypes` argument is now mandatory.
+ - `getFrecentInserterItems`: the `allowedBlockTypes` argument is now mandatory.
 
 ## 2.7.0
 
-- `wp.element.getWrapperDisplayName` function removed. Please use `wp.element.createHigherOrderComponent` instead.
+ - `wp.element.getWrapperDisplayName` function removed. Please use `wp.element.createHigherOrderComponent` instead.
 
 ## 2.6.0
 
diff --git a/edit-post/README.md b/edit-post/README.md
index da5d35aecc41b..af78b310c4fd7 100644
--- a/edit-post/README.md
+++ b/edit-post/README.md
@@ -6,7 +6,7 @@ Refer to [the plugins module documentation](../plugins/) for more information.
 
 ## Plugin Components
 
-The following components can be used with the `registerPlugin` ([see documentation](../plugins)) API.
+The following components can be used with the `registerPlugin` ([see documentation](../packages/plugins)) API.
 They can be found in the global variable `wp.editPost` when defining `wp-edit-post` as a script dependency.
 
 ### `PluginSidebar`
diff --git a/edit-post/assets/stylesheets/_animations.scss b/edit-post/assets/stylesheets/_animations.scss
index b3068ec3bc342..0ebdbf228adef 100644
--- a/edit-post/assets/stylesheets/_animations.scss
+++ b/edit-post/assets/stylesheets/_animations.scss
@@ -30,3 +30,17 @@
 	animation: fade-in $speed ease-out;
 	animation-fill-mode: forwards;
 }
+
+@keyframes editor_region_focus {
+	from {
+		box-shadow: inset 0 0 0 0 $blue-medium-400;
+	}
+	to {
+		box-shadow: inset 0 0 0 4px $blue-medium-400;
+	}
+}
+
+@mixin region_focus( $speed: 0.2s ) {
+	animation: editor_region_focus $speed ease-out;
+	animation-fill-mode: forwards;
+}
\ No newline at end of file
diff --git a/edit-post/assets/stylesheets/_variables.scss b/edit-post/assets/stylesheets/_variables.scss
index a8e69e19f88c0..c8a14b37c19d0 100644
--- a/edit-post/assets/stylesheets/_variables.scss
+++ b/edit-post/assets/stylesheets/_variables.scss
@@ -52,6 +52,8 @@ $block-side-ui-clearance: 2px; // space between side UI and block
 $block-side-ui-padding: $block-side-ui-width + $block-side-ui-clearance; // total space used to accommodate side UI
 $block-parent-side-ui-clearance: $parent-block-padding - $block-padding; // space between side UI and block on top level blocks
 
+$block-container-side-padding: $block-side-ui-width + $block-padding + 2 * $block-side-ui-clearance;
+
 // Buttons & UI Widgets
 $button-style__radius-roundrect: 4px;
 $button-style__radius-round: 50%;
diff --git a/edit-post/components/browser-url/index.js b/edit-post/components/browser-url/index.js
index b3973dd88070d..7d50e89772540 100644
--- a/edit-post/components/browser-url/index.js
+++ b/edit-post/components/browser-url/index.js
@@ -16,6 +16,22 @@ export function getPostEditURL( postId ) {
 	return addQueryArgs( 'post.php', { post: postId, action: 'edit' } );
 }
 
+/**
+ * Returns the Post's Trashedd URL.
+ *
+ * @param {number} postId    Post ID.
+ * @param {string} postType Post Type.
+ *
+ * @return {string} Post trashed URL.
+ */
+export function getPostTrashedURL( postId, postType ) {
+	return addQueryArgs( 'edit.php', {
+		trashed: 1,
+		post_type: postType,
+		ids: postId,
+	} );
+}
+
 export class BrowserURL extends Component {
 	constructor() {
 		super( ...arguments );
@@ -26,17 +42,29 @@ export class BrowserURL extends Component {
 	}
 
 	componentDidUpdate( prevProps ) {
-		const { postId, postStatus } = this.props;
+		const { postId, postStatus, postType } = this.props;
 		const { historyId } = this.state;
-		if ( postId === prevProps.postId && postId === historyId ) {
+
+		if ( postStatus === 'trash' ) {
+			this.setTrashURL( postId, postType );
 			return;
 		}
 
-		if ( postStatus !== 'auto-draft' ) {
+		if ( ( postId !== prevProps.postId || postId !== historyId ) && postStatus !== 'auto-draft' ) {
 			this.setBrowserURL( postId );
 		}
 	}
 
+	/**
+	 * Navigates the browser to the post trashed URL to show a notice about the trashed post.
+	 *
+	 * @param {number} postId    Post ID.
+	 * @param {string} postType  Post Type.
+	 */
+	setTrashURL( postId, postType ) {
+		window.location.href = getPostTrashedURL( postId, postType );
+	}
+
 	/**
 	 * Replaces the browser URL with a post editor link for the given post ID.
 	 *
@@ -65,10 +93,11 @@ export class BrowserURL extends Component {
 
 export default withSelect( ( select ) => {
 	const { getCurrentPost } = select( 'core/editor' );
-	const { id, status } = getCurrentPost();
+	const { id, status, type } = getCurrentPost();
 
 	return {
 		postId: id,
 		postStatus: status,
+		postType: type,
 	};
 } )( BrowserURL );
diff --git a/edit-post/components/browser-url/test/index.js b/edit-post/components/browser-url/test/index.js
index 953c2dac92393..a669896f5ca03 100644
--- a/edit-post/components/browser-url/test/index.js
+++ b/edit-post/components/browser-url/test/index.js
@@ -6,7 +6,7 @@ import { shallow } from 'enzyme';
 /**
  * Internal dependencies
  */
-import { getPostEditURL, BrowserURL } from '../';
+import { getPostEditURL, getPostTrashedURL, BrowserURL } from '../';
 
 describe( 'getPostEditURL', () => {
 	it( 'should generate relative path with post and action arguments', () => {
@@ -16,6 +16,14 @@ describe( 'getPostEditURL', () => {
 	} );
 } );
 
+describe( 'getPostTrashedURL', () => {
+	it( 'should generate relative path with post and action arguments', () => {
+		const url = getPostTrashedURL( 1, 'page' );
+
+		expect( url ).toBe( 'edit.php?trashed=1&post_type=page&ids=1' );
+	} );
+} );
+
 describe( 'BrowserURL', () => {
 	let replaceStateSpy;
 
diff --git a/edit-post/components/header/fixed-toolbar-toggle/index.js b/edit-post/components/header/fixed-toolbar-toggle/index.js
index 5561dc7eb99d8..e20ee631c0b65 100644
--- a/edit-post/components/header/fixed-toolbar-toggle/index.js
+++ b/edit-post/components/header/fixed-toolbar-toggle/index.js
@@ -8,23 +8,18 @@ import { withSelect, withDispatch } from '@wordpress/data';
  */
 import { __ } from '@wordpress/i18n';
 import { compose } from '@wordpress/element';
-import { MenuGroup, MenuItem, withInstanceId } from '@wordpress/components';
+import { MenuItem } from '@wordpress/components';
 import { ifViewportMatches } from '@wordpress/viewport';
 
-function FeatureToggle( { onToggle, isActive } ) {
+function FixedToolbarToggle( { onToggle, isActive } ) {
 	return (
-		<MenuGroup
-			label={ __( 'Settings' ) }
-			filterName="editPost.MoreMenu.settings"
+		<MenuItem
+			icon={ isActive && 'yes' }
+			isSelected={ isActive }
+			onClick={ onToggle }
 		>
-			<MenuItem
-				icon={ isActive && 'yes' }
-				isSelected={ isActive }
-				onClick={ onToggle }
-			>
-				{ __( 'Fix Toolbar to Top' ) }
-			</MenuItem>
-		</MenuGroup>
+			{ __( 'Fix Toolbar to Top' ) }
+		</MenuItem>
 	);
 }
 
@@ -39,5 +34,4 @@ export default compose( [
 		},
 	} ) ),
 	ifViewportMatches( 'medium' ),
-	withInstanceId,
-] )( FeatureToggle );
+] )( FixedToolbarToggle );
diff --git a/edit-post/components/header/more-menu/index.js b/edit-post/components/header/more-menu/index.js
index d880252e977c1..4799004916f73 100644
--- a/edit-post/components/header/more-menu/index.js
+++ b/edit-post/components/header/more-menu/index.js
@@ -11,6 +11,7 @@ import './style.scss';
 import ModeSwitcher from '../mode-switcher';
 import FixedToolbarToggle from '../fixed-toolbar-toggle';
 import PluginMoreMenuGroup from '../plugins-more-menu-group';
+import TipsToggle from '../tips-toggle';
 
 const MoreMenu = () => (
 	<Dropdown
@@ -27,7 +28,13 @@ const MoreMenu = () => (
 		renderContent={ ( { onClose } ) => (
 			<div className="edit-post-more-menu__content">
 				<ModeSwitcher onSelect={ onClose } />
-				<FixedToolbarToggle onToggle={ onClose } />
+				<MenuGroup
+					label={ __( 'Settings' ) }
+					filterName="editPost.MoreMenu.settings"
+				>
+					<FixedToolbarToggle onToggle={ onClose } />
+					<TipsToggle onToggle={ onClose } />
+				</MenuGroup>
 				<PluginMoreMenuGroup.Slot fillProps={ { onClose } } />
 				<MenuGroup
 					label={ __( 'Tools' ) }
diff --git a/edit-post/components/header/more-menu/test/__snapshots__/index.js.snap b/edit-post/components/header/more-menu/test/__snapshots__/index.js.snap
new file mode 100644
index 0000000000000..b4b682a24b1fd
--- /dev/null
+++ b/edit-post/components/header/more-menu/test/__snapshots__/index.js.snap
@@ -0,0 +1,72 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`MoreMenu should match snapshot 1`] = `
+<MoreMenu>
+  <Dropdown
+    className="edit-post-more-menu"
+    position="bottom left"
+    renderContent={[Function]}
+    renderToggle={[Function]}
+  >
+    <div
+      className="edit-post-more-menu"
+    >
+      <div>
+        <IconButton
+          aria-expanded={false}
+          icon="ellipsis"
+          label="More"
+          onClick={[Function]}
+        >
+          <Tooltip
+            text="More"
+          >
+            <Button
+              aria-expanded={false}
+              aria-label="More"
+              className="components-icon-button"
+              onBlur={[Function]}
+              onClick={[Function]}
+              onFocus={[Function]}
+              onMouseEnter={[Function]}
+              onMouseLeave={[Function]}
+            >
+              <button
+                aria-expanded={false}
+                aria-label="More"
+                className="components-button components-icon-button"
+                onBlur={[Function]}
+                onClick={[Function]}
+                onFocus={[Function]}
+                onMouseEnter={[Function]}
+                onMouseLeave={[Function]}
+                type="button"
+              >
+                <Dashicon
+                  icon="ellipsis"
+                  key="0,0"
+                >
+                  <svg
+                    aria-hidden={true}
+                    className="dashicon dashicons-ellipsis"
+                    focusable="false"
+                    height={20}
+                    role="img"
+                    viewBox="0 0 20 20"
+                    width={20}
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      d="M5 10c0 1.1-.9 2-2 2s-2-.9-2-2 .9-2 2-2 2 .9 2 2zm12-2c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2zm-7 0c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2z"
+                    />
+                  </svg>
+                </Dashicon>
+              </button>
+            </Button>
+          </Tooltip>
+        </IconButton>
+      </div>
+    </div>
+  </Dropdown>
+</MoreMenu>
+`;
diff --git a/edit-post/components/header/more-menu/test/index.js b/edit-post/components/header/more-menu/test/index.js
new file mode 100644
index 0000000000000..83f9de19ba706
--- /dev/null
+++ b/edit-post/components/header/more-menu/test/index.js
@@ -0,0 +1,19 @@
+/**
+ * External dependencies
+ */
+import { mount } from 'enzyme';
+
+/**
+ * Internal dependencies
+ */
+import MoreMenu from '../index';
+
+describe( 'MoreMenu', () => {
+	it( 'should match snapshot', () => {
+		const wrapper = mount(
+			<MoreMenu />
+		);
+
+		expect( wrapper ).toMatchSnapshot();
+	} );
+} );
diff --git a/edit-post/components/header/tips-toggle/index.js b/edit-post/components/header/tips-toggle/index.js
new file mode 100644
index 0000000000000..27b131cb04333
--- /dev/null
+++ b/edit-post/components/header/tips-toggle/index.js
@@ -0,0 +1,40 @@
+/**
+ * WordPress Dependencies
+ */
+import { withSelect, withDispatch } from '@wordpress/data';
+
+/**
+ * WordPress Dependencies
+ */
+import { __ } from '@wordpress/i18n';
+import { compose } from '@wordpress/element';
+import { MenuItem } from '@wordpress/components';
+
+function TipsToggle( { onToggle, isActive } ) {
+	return (
+		<MenuItem
+			icon={ isActive && 'yes' }
+			isSelected={ isActive }
+			onClick={ onToggle }
+		>
+			{ __( 'Show Tips' ) }
+		</MenuItem>
+	);
+}
+
+export default compose( [
+	withSelect( ( select ) => ( {
+		isActive: select( 'core/nux' ).areTipsEnabled(),
+	} ) ),
+	withDispatch( ( dispatch, ownProps ) => ( {
+		onToggle() {
+			const { disableTips, enableTips } = dispatch( 'core/nux' );
+			if ( ownProps.isActive ) {
+				disableTips();
+			} else {
+				enableTips();
+			}
+			ownProps.onToggle();
+		},
+	} ) ),
+] )( TipsToggle );
diff --git a/edit-post/components/visual-editor/style.scss b/edit-post/components/visual-editor/style.scss
index 75e9a154646a8..709b39468a323 100644
--- a/edit-post/components/visual-editor/style.scss
+++ b/edit-post/components/visual-editor/style.scss
@@ -50,8 +50,8 @@
 		}
 
 		&[data-align="full"] > .editor-block-contextual-toolbar,
-		&[data-align="wide"] > .editor-block-contextual-toolbar { // don't affect nested block toolbars
-			max-width: $content-width + 2;	// 1px border left and right
+		&[data-align="wide"] > .editor-block-contextual-toolbar { // Don't affect nested block toolbars.
+			max-width: $content-width + $parent-block-padding; // Add 1px border left and right.
 			margin-left: auto;
 			margin-right: auto;
 		}
@@ -69,8 +69,8 @@
 // The base width of the title should match that of blocks even if it isn't a block
 .editor-post-title {
 	@include break-small() {
-		padding-left: $block-side-ui-padding;
-		padding-right: $block-side-ui-padding;
+		padding-left: $block-container-side-padding;
+		padding-right: $block-container-side-padding;
 	}
 }
 .edit-post-visual-editor .editor-post-title__block {
@@ -78,13 +78,13 @@
 	margin-right: auto;
 	max-width: $content-width;
 
-	// stack borders
+	// Stack borders.
 	> div {
-		margin-left: -1px;
-		margin-right: -1px;
+		margin-left: 0;
+		margin-right: 0;
 	}
 
-	// include space for side UI on desktops
+	// Include space for side UI on desktops.
 	@include break-small() {
 		> div {
 			margin-left: -$block-side-ui-width;
diff --git a/edit-post/hooks/blocks/index.js b/edit-post/hooks/components/index.js
similarity index 73%
rename from edit-post/hooks/blocks/index.js
rename to edit-post/hooks/components/index.js
index 35b318203784e..20f16a7461def 100644
--- a/edit-post/hooks/blocks/index.js
+++ b/edit-post/hooks/components/index.js
@@ -11,7 +11,7 @@ import MediaUpload from './media-upload';
 const replaceMediaUpload = () => MediaUpload;
 
 addFilter(
-	'blocks.MediaUpload',
-	'core/edit-post/blocks/media-upload/replaceMediaUpload',
+	'editor.MediaUpload',
+	'core/edit-post/components/media-upload/replace-media-upload',
 	replaceMediaUpload
 );
diff --git a/edit-post/hooks/blocks/media-upload/index.js b/edit-post/hooks/components/media-upload/index.js
similarity index 100%
rename from edit-post/hooks/blocks/media-upload/index.js
rename to edit-post/hooks/components/media-upload/index.js
diff --git a/edit-post/hooks/index.js b/edit-post/hooks/index.js
index 91d683b62ae75..ef9c274541dae 100644
--- a/edit-post/hooks/index.js
+++ b/edit-post/hooks/index.js
@@ -1,6 +1,6 @@
 /**
  * Internal dependencies
  */
-import './blocks';
+import './components';
 import './more-menu';
 import './validate-multiple-use';
diff --git a/edit-post/hooks/validate-multiple-use/index.js b/edit-post/hooks/validate-multiple-use/index.js
index 388c03bce94f9..db5b848e3e931 100644
--- a/edit-post/hooks/validate-multiple-use/index.js
+++ b/edit-post/hooks/validate-multiple-use/index.js
@@ -125,7 +125,7 @@ function getOutboundType( blockName ) {
 }
 
 addFilter(
-	'blocks.BlockEdit',
-	'core/validation/multiple',
+	'editor.BlockEdit',
+	'core/edit-post/validate-multiple-use/with-multiple-validation',
 	withMultipleValidation
 );
diff --git a/edit-post/index.js b/edit-post/index.js
index f211b4649ec1a..cc5692681050c 100644
--- a/edit-post/index.js
+++ b/edit-post/index.js
@@ -50,15 +50,6 @@ export function reinitializeEditor( postType, postId, target, settings, override
  * @return {Object} Editor interface.
  */
 export function initializeEditor( id, postType, postId, settings, overridePost ) {
-	if ( 'production' !== process.env.NODE_ENV ) {
-		// Remove with 3.0 release.
-		window.console.info(
-			'`isSelected` usage is no longer mandatory with `BlockControls`, `InspectorControls` and `RichText`. ' +
-			'It is now handled by the editor internally to ensure that controls are visible only when block is selected. ' +
-			'See updated docs: https://github.com/WordPress/gutenberg/blob/master/blocks/README.md#components.'
-		);
-	}
-
 	const target = document.getElementById( id );
 	const reboot = reinitializeEditor.bind( null, postType, postId, target, settings, overridePost );
 
diff --git a/edit-post/store/effects.js b/edit-post/store/effects.js
index 2143abc2018ce..018a854b0bcb7 100644
--- a/edit-post/store/effects.js
+++ b/edit-post/store/effects.js
@@ -53,12 +53,24 @@ const effects = {
 		}, {} );
 		store.dispatch( setMetaBoxSavedData( dataPerLocation ) );
 
-		// Saving metaboxes when saving posts
-		subscribe( onChangeListener( select( 'core/editor' ).isSavingPost, ( isSavingPost ) => {
-			if ( ! isSavingPost ) {
+		let wasSavingPost = select( 'core/editor' ).isSavingPost();
+		let wasAutosavingPost = select( 'core/editor' ).isAutosavingPost();
+		// Save metaboxes when performing a full save on the post.
+		subscribe( () => {
+			const isSavingPost = select( 'core/editor' ).isSavingPost();
+			const isAutosavingPost = select( 'core/editor' ).isAutosavingPost();
+
+			// Save metaboxes on save completion when past save wasn't an autosave.
+			const shouldTriggerMetaboxesSave = wasSavingPost && ! wasAutosavingPost && ! isSavingPost && ! isAutosavingPost;
+
+			// Save current state for next inspection.
+			wasSavingPost = isSavingPost;
+			wasAutosavingPost = isAutosavingPost;
+
+			if ( shouldTriggerMetaboxesSave ) {
 				store.dispatch( requestMetaBoxUpdates() );
 			}
-		} ) );
+		} );
 	},
 	REQUEST_META_BOX_UPDATES( action, store ) {
 		const state = store.getState();
diff --git a/editor/components/autocomplete/README.md b/editor/components/autocomplete/README.md
index bf3b564d3cb8e..46fff1bd72b35 100644
--- a/editor/components/autocomplete/README.md
+++ b/editor/components/autocomplete/README.md
@@ -1,6 +1,6 @@
 Autocomplete
 ============
 
-This is an Autocomplete component for use in block UI. It is based on `Autocomplete` from `@wordpress/components` and takes the same props. In addition, it passes its autocompleters through a `blocks.Autocomplete.completers` filter to give developers an opportunity to override or extend them.
+This is an Autocomplete component for use in block UI. It is based on `Autocomplete` from `@wordpress/components` and takes the same props. In addition, it passes its autocompleters through a `editor.Autocomplete.completers` filter to give developers an opportunity to override or extend them.
 
 The autocompleter interface is documented with the original `Autocomplete` component in `@wordpress/components`.
diff --git a/editor/components/autocomplete/index.js b/editor/components/autocomplete/index.js
index ea9f37ea63938..1a9c66f26597c 100644
--- a/editor/components/autocomplete/index.js
+++ b/editor/components/autocomplete/index.js
@@ -78,10 +78,9 @@ export function withFilteredAutocompleters( Autocomplete ) {
 			let nextCompleters = completers;
 			const lastFilteredCompletersProp = nextCompleters;
 
-			// Todo: Rename filter
-			if ( hasFilter( 'blocks.Autocomplete.completers' ) ) {
+			if ( hasFilter( 'editor.Autocomplete.completers' ) ) {
 				nextCompleters = applyFilters(
-					'blocks.Autocomplete.completers',
+					'editor.Autocomplete.completers',
 					// Provide copies so filters may directly modify them.
 					nextCompleters && nextCompleters.map( clone ),
 					blockName,
diff --git a/editor/components/autocomplete/test/index.js b/editor/components/autocomplete/test/index.js
index 91b9d442e9532..bd6e217a27da4 100644
--- a/editor/components/autocomplete/test/index.js
+++ b/editor/components/autocomplete/test/index.js
@@ -23,7 +23,7 @@ describe( 'Autocomplete', () => {
 	let wrapper = null;
 
 	afterEach( () => {
-		removeFilter( 'blocks.Autocomplete.completers', 'test/autocompleters-hook' );
+		removeFilter( 'editor.Autocomplete.completers', 'test/autocompleters-hook' );
 
 		if ( wrapper ) {
 			wrapper.unmount();
@@ -34,7 +34,7 @@ describe( 'Autocomplete', () => {
 	it( 'filters supplied completers when next focused', () => {
 		const completersFilter = jest.fn();
 		addFilter(
-			'blocks.Autocomplete.completers',
+			'editor.Autocomplete.completers',
 			'test/autocompleters-hook',
 			completersFilter
 		);
@@ -55,7 +55,7 @@ describe( 'Autocomplete', () => {
 
 		const completersFilter = jest.fn();
 		addFilter(
-			'blocks.Autocomplete.completers',
+			'editor.Autocomplete.completers',
 			'test/autocompleters-hook',
 			completersFilter
 		);
@@ -70,7 +70,7 @@ describe( 'Autocomplete', () => {
 	it( 'provides copies of completers to filter', () => {
 		const completersFilter = jest.fn();
 		addFilter(
-			'blocks.Autocomplete.completers',
+			'editor.Autocomplete.completers',
 			'test/autocompleters-hook',
 			completersFilter
 		);
@@ -91,7 +91,7 @@ describe( 'Autocomplete', () => {
 		const expectedFilteredCompleters = [ {}, {} ];
 		const completersFilter = jest.fn( () => expectedFilteredCompleters );
 		addFilter(
-			'blocks.Autocomplete.completers',
+			'editor.Autocomplete.completers',
 			'test/autocompleters-hook',
 			completersFilter
 		);
diff --git a/editor/components/block-edit/context.js b/editor/components/block-edit/context.js
index a1f413b94ad58..ee64a062f4433 100644
--- a/editor/components/block-edit/context.js
+++ b/editor/components/block-edit/context.js
@@ -13,6 +13,7 @@ const { Consumer, Provider } = createContext( {
 	isSelected: false,
 	focusedElement: null,
 	setFocusedElement: noop,
+	uid: null,
 } );
 
 export { Provider as BlockEditContextProvider };
diff --git a/editor/components/block-edit/edit.js b/editor/components/block-edit/edit.js
index 9b20a0d286b88..4deaa389581be 100644
--- a/editor/components/block-edit/edit.js
+++ b/editor/components/block-edit/edit.js
@@ -36,4 +36,4 @@ export const Edit = ( props ) => {
 	);
 };
 
-export default withFilters( 'blocks.BlockEdit' )( Edit );
+export default withFilters( 'editor.BlockEdit' )( Edit );
diff --git a/editor/components/block-edit/index.js b/editor/components/block-edit/index.js
index a0ab798ef575b..f309e93d47a87 100644
--- a/editor/components/block-edit/index.js
+++ b/editor/components/block-edit/index.js
@@ -8,7 +8,7 @@ import { noop, get } from 'lodash';
  */
 import { withSelect } from '@wordpress/data';
 import { Component, compose } from '@wordpress/element';
-import { withContext, withAPIData } from '@wordpress/components';
+import { withAPIData } from '@wordpress/components';
 
 /**
  * Internal dependencies
@@ -27,15 +27,9 @@ export class BlockEdit extends Component {
 	}
 
 	getChildContext() {
-		const {
-			id: uid,
-			user,
-			createInnerBlockList,
-		} = this.props;
+		const { user } = this.props;
 
 		return {
-			uid,
-			BlockList: createInnerBlockList( uid ),
 			canUserUseUnfilteredHTML: get( user.data, [
 				'capabilities',
 				'unfiltered_html',
@@ -52,18 +46,13 @@ export class BlockEdit extends Component {
 		} );
 	}
 
-	static getDerivedStateFromProps( { name, isSelected }, prevState ) {
-		if (
-			name === prevState.name &&
-			isSelected === prevState.isSelected
-		) {
-			return null;
-		}
+	static getDerivedStateFromProps( props ) {
+		const { id, name, isSelected } = props;
 
 		return {
-			...prevState,
 			name,
 			isSelected,
+			uid: id,
 		};
 	}
 
@@ -77,8 +66,6 @@ export class BlockEdit extends Component {
 }
 
 BlockEdit.childContextTypes = {
-	uid: noop,
-	BlockList: noop,
 	canUserUseUnfilteredHTML: noop,
 };
 
@@ -89,5 +76,4 @@ export default compose( [
 	withAPIData( ( { postType } ) => ( {
 		user: `/wp/v2/users/me?post_type=${ postType }&context=edit`,
 	} ) ),
-	withContext( 'createInnerBlockList' )(),
 ] )( BlockEdit );
diff --git a/editor/components/block-icon/index.js b/editor/components/block-icon/index.js
index cb8cc122ef875..00b65d48c9784 100644
--- a/editor/components/block-icon/index.js
+++ b/editor/components/block-icon/index.js
@@ -1,10 +1,16 @@
+/**
+ * External dependencies
+ */
+import classnames from 'classnames';
+
 /**
  * WordPress dependencies
  */
+import './style.scss';
 import { Dashicon } from '@wordpress/components';
 import { createElement, Component } from '@wordpress/element';
 
-export default function BlockIcon( { icon } ) {
+function renderIcon( icon ) {
 	if ( 'string' === typeof icon ) {
 		return <Dashicon icon={ icon } />;
 	} else if ( 'function' === typeof icon ) {
@@ -17,3 +23,21 @@ export default function BlockIcon( { icon } ) {
 
 	return icon || null;
 }
+
+export default function BlockIcon( { icon, showColors = false, className } ) {
+	const renderedIcon = renderIcon( icon && icon.src ? icon.src : icon );
+	if ( showColors ) {
+		return (
+			<div
+				style={ {
+					backgroundColor: icon && icon.background,
+					color: icon && icon.foreground,
+				} }
+				className={ classnames( 'editor-block-icon__colors', className ) }
+			>
+				{ renderedIcon }
+			</div>
+		);
+	}
+	return renderedIcon;
+}
diff --git a/editor/components/block-icon/style.scss b/editor/components/block-icon/style.scss
new file mode 100644
index 0000000000000..900a9f77cee9a
--- /dev/null
+++ b/editor/components/block-icon/style.scss
@@ -0,0 +1,10 @@
+.editor-block-icon__colors {
+	background: $light-gray-200;
+	border-radius: 4px;
+	display: flex;
+	height: $icon-button-size-small;
+	align-items: center;
+	margin-left: -2px;
+	margin-right: 10px;
+	padding: 0 8px;
+}
diff --git a/editor/components/block-inspector/index.js b/editor/components/block-inspector/index.js
index ce2f7f42903ff..8352078ac773f 100644
--- a/editor/components/block-inspector/index.js
+++ b/editor/components/block-inspector/index.js
@@ -20,7 +20,7 @@ import BlockIcon from '../block-icon';
 import InspectorControls from '../inspector-controls';
 import InspectorAdvancedControls from '../inspector-advanced-controls';
 
-const BlockInspector = ( { selectedBlock, count } ) => {
+const BlockInspector = ( { selectedBlock, blockType, count } ) => {
 	if ( count > 1 ) {
 		return <span className="editor-block-inspector__multi-blocks">{ __( 'Coming Soon' ) }</span>;
 	}
@@ -29,13 +29,9 @@ const BlockInspector = ( { selectedBlock, count } ) => {
 		return <span className="editor-block-inspector__no-blocks">{ __( 'No block selected.' ) }</span>;
 	}
 
-	const blockType = getBlockType( selectedBlock.name );
-
 	return [
 		<div className="editor-block-inspector__card" key="card">
-			<div className="editor-block-inspector__card-icon">
-				<BlockIcon icon={ blockType.icon && blockType.icon.src } />
-			</div>
+			<BlockIcon icon={ blockType.icon } showColors />
 			<div className="editor-block-inspector__card-content">
 				<div className="editor-block-inspector__card-title">{ blockType.title }</div>
 				<div className="editor-block-inspector__card-description">{ blockType.description }</div>
@@ -60,8 +56,11 @@ const BlockInspector = ( { selectedBlock, count } ) => {
 export default withSelect(
 	( select ) => {
 		const { getSelectedBlock, getSelectedBlockCount } = select( 'core/editor' );
+		const selectedBlock = getSelectedBlock();
+		const blockType = selectedBlock && getBlockType( selectedBlock.name );
 		return {
-			selectedBlock: getSelectedBlock(),
+			selectedBlock,
+			blockType,
 			count: getSelectedBlockCount(),
 		};
 	}
diff --git a/editor/components/block-list/block-html.js b/editor/components/block-list/block-html.js
index 177449a5aa978..8a33cfa9f8f66 100644
--- a/editor/components/block-list/block-html.js
+++ b/editor/components/block-list/block-html.js
@@ -22,10 +22,10 @@ class BlockHTML extends Component {
 		};
 	}
 
-	componentWillReceiveProps( nextProps ) {
-		if ( ! isEqual( nextProps.block.attributes, this.props.block.attributes ) ) {
+	componentDidUpdate( prevProps ) {
+		if ( ! isEqual( this.props.block.attributes, prevProps.block.attributes ) ) {
 			this.setState( {
-				html: getBlockContent( nextProps.block ),
+				html: getBlockContent( this.props.block ),
 			} );
 		}
 	}
diff --git a/editor/components/block-list/block.js b/editor/components/block-list/block.js
index 88059e8212490..fb03d7b7d0c4a 100644
--- a/editor/components/block-list/block.js
+++ b/editor/components/block-list/block.js
@@ -2,7 +2,7 @@
  * External dependencies
  */
 import classnames from 'classnames';
-import { get, reduce, size, castArray, first, last, noop } from 'lodash';
+import { get, reduce, size, castArray, first, last } from 'lodash';
 import tinymce from 'tinymce';
 
 /**
@@ -50,7 +50,6 @@ import IgnoreNestedEvents from './ignore-nested-events';
 import InserterWithShortcuts from '../inserter-with-shortcuts';
 import Inserter from '../inserter';
 import withHoverAreas from './with-hover-areas';
-import { createInnerBlockList } from '../../utils/block-list';
 
 const { BACKSPACE, DELETE, ENTER } = keycodes;
 
@@ -75,7 +74,6 @@ export class BlockListBlock extends Component {
 		this.onDragStart = this.onDragStart.bind( this );
 		this.onDragEnd = this.onDragEnd.bind( this );
 		this.selectOnOpen = this.selectOnOpen.bind( this );
-		this.createInnerBlockList = this.createInnerBlockList.bind( this );
 		this.hadTouchStart = false;
 
 		this.state = {
@@ -85,38 +83,17 @@ export class BlockListBlock extends Component {
 		};
 	}
 
-	createInnerBlockList( uid ) {
-		return createInnerBlockList( uid );
-	}
-
-	/**
-	 * Provides context for descendent components for use in block rendering.
-	 *
-	 * @return {Object} Child context.
-	 */
-	getChildContext() {
-		// Blocks may render their own BlockEdit, in which case we must provide
-		// a mechanism for them to create their own InnerBlockList. BlockEdit
-		// is defined in `@wordpress/blocks`, so to avoid a circular dependency
-		// we inject this function via context.
-		return {
-			createInnerBlockList: this.createInnerBlockList,
-		};
-	}
-
 	componentDidMount() {
 		if ( this.props.isSelected ) {
 			this.focusTabbable();
 		}
 	}
 
-	componentWillReceiveProps( newProps ) {
-		if ( newProps.isTypingWithinBlock || newProps.isSelected ) {
+	componentDidUpdate( prevProps ) {
+		if ( this.props.isTypingWithinBlock || this.props.isSelected ) {
 			this.hideHoverEffects();
 		}
-	}
 
-	componentDidUpdate( prevProps ) {
 		if ( this.props.isSelected && ! prevProps.isSelected ) {
 			this.focusTabbable();
 		}
@@ -511,6 +488,7 @@ export class BlockListBlock extends Component {
 						rootUID={ rootUID }
 						layout={ layout }
 						canShowInserter={ canShowInBetweenInserter }
+						onInsert={ this.hideHoverEffects }
 					/>
 				) }
 				<BlockDropZone
@@ -696,10 +674,6 @@ const applyWithDispatch = withDispatch( ( dispatch, ownProps ) => {
 	};
 } );
 
-BlockListBlock.childContextTypes = {
-	createInnerBlockList: noop,
-};
-
 export default compose(
 	applyWithSelect,
 	applyWithDispatch,
diff --git a/editor/components/block-list/insertion-point.js b/editor/components/block-list/insertion-point.js
index f205d6812dd68..960f3f8793f0b 100644
--- a/editor/components/block-list/insertion-point.js
+++ b/editor/components/block-list/insertion-point.js
@@ -27,6 +27,7 @@ class BlockInsertionPoint extends Component {
 	onFocusInserter( event ) {
 		// We stop propagation of the focus event to avoid selecting the current block
 		// While we're trying to insert a new block
+		// We also attach this to onMouseDown, due to a difference in behavior in Firefox and Safari, where buttons don't receive focus: https://gist.github.com/cvrebert/68659d0333a578d75372
 		event.stopPropagation();
 
 		this.setState( {
@@ -45,6 +46,9 @@ class BlockInsertionPoint extends Component {
 		props.insertDefaultBlock( { layout }, rootUID, index );
 		props.startTyping();
 		this.onBlurInserter();
+		if ( props.onInsert ) {
+			this.props.onInsert();
+		}
 	}
 
 	render() {
@@ -62,6 +66,7 @@ class BlockInsertionPoint extends Component {
 							onClick={ this.onClick }
 							label={ __( 'Insert block' ) }
 							onFocus={ this.onFocusInserter }
+							onMouseDown={ this.onFocusInserter }
 							onBlur={ this.onBlurInserter }
 						/>
 					</div>
diff --git a/editor/components/block-list/style.scss b/editor/components/block-list/style.scss
index 0b2c228fc836c..0bcaac46b62a4 100644
--- a/editor/components/block-list/style.scss
+++ b/editor/components/block-list/style.scss
@@ -104,11 +104,11 @@
 }
 
 .editor-block-list__layout {
-	// make room in the main content column for the side UI
-	// the side UI uses negative margins to position itself so as to not affect the block width
+	// Make room in the main content column for the side UI.
+	// The side UI uses negative margins to position itself so as to not affect the block width.
 	@include break-small() {
-		padding-left: $block-side-ui-padding;
-		padding-right: $block-side-ui-padding;
+		padding-left: $block-container-side-padding;
+		padding-right: $block-container-side-padding;
 	}
 
 	// Don't add side padding for nested blocks, and compensate for block padding
@@ -136,6 +136,9 @@
 	padding-left: $block-padding;
 	padding-right: $block-padding;
 
+	// Break long strings of text without spaces so they don't overflow the block.
+	overflow-wrap: break-word;
+
 	@include break-small() {
 		// The block mover needs to stay inside the block to allow clicks when hovering the block
 		padding-left: $block-padding + $block-side-ui-padding - $border-width;
@@ -221,14 +224,19 @@
 			transition: outline .1s linear;
 			pointer-events: none;
 
-			// show wider padding for top level blocks
-			right: -$parent-block-padding;
-			left: -$parent-block-padding;
 			top: -$block-padding;
 			bottom: -$block-padding;
+			right: -$block-padding;
+			left: -$block-padding;
+
+			// Show wider padding for top level blocks.
+			@include break-small() {
+				right: -$parent-block-padding;
+				left: -$parent-block-padding;
+			}
 		}
 
-		// show smaller padding for child blocks
+		// Show smaller padding for child blocks.
 		.editor-block-list__block-edit:before {
 			right: -$block-padding;
 			left: -$block-padding;
@@ -346,16 +354,24 @@
 	// Alignments
 	&[data-align="left"],
 	&[data-align="right"] {
-		// Without z-index, won't be clickable as "above" adjacent content
+		// Without z-index, won't be clickable as "above" adjacent content.
 		z-index: z-index( '.editor-block-list__block {core/image aligned left or right}' );
 		width: 100%;
 
-		// When images are floated, the block itself should collapse to zero height
+		// When images are floated, the block itself should collapse to zero height.
 		margin-bottom: 0;
+		height: 0;
 
-		// Hide block outline when an image is floated
-		&:before {
-			content: none;
+		// Hide block outline when an image is floated.
+		.editor-block-list__block-edit {
+			&:before {
+				content: none;
+			}
+		}
+
+		// The padding collapses, but the outline is still 1px to compensate for.
+		.editor-block-contextual-toolbar {
+			margin-bottom: 1px;
 		}
 	}
 
@@ -432,6 +448,7 @@
 		> .editor-block-mover {
 			display: none;
 		}
+
 		@include break-wide() {
 			> .editor-block-mover {
 				display: block;
@@ -454,11 +471,11 @@
 		> .editor-block-list__breadcrumb {
 			right: -$border-width;
 		}
-		
-		// compensate for main container padding, subtract border
+
+		// Compensate for main container padding and subtract border.
 		@include break-small() {
-			margin-left: -$block-side-ui-padding + $border-width;
-			margin-right: -$block-side-ui-padding + $border-width;
+			margin-left: -$block-side-ui-width - $block-padding - $block-side-ui-clearance - $border-width;
+			margin-right: -$block-side-ui-width - $block-padding - $block-side-ui-clearance - $border-width;
 		}
 
 		> .editor-block-list__block-edit {
@@ -470,7 +487,7 @@
 				margin-right: -$block-side-ui-padding - $block-padding;
 			}
 
-			// this explicitly sets the width of the block, to override the fit-content from the image block
+			// This explicitly sets the width of the block, to override the fit-content from the image block.
 			figure {
 				width: 100%;
 			}
@@ -579,12 +596,20 @@
 			display: block;
 		}
 	}
+}
+
+
+/**
+ * Mobile unified toolbar.
+ */
+
+.editor-block-list__block {
 
 	// Show side UI inline below the block on mobile.
 	.editor-block-list__block-mobile-toolbar {
 		display: flex;
 		flex-direction: row;
-		margin-top: $item-spacing + $block-toolbar-height; // Make room for the height of the block toolbar above. 
+		margin-top: $item-spacing + $block-toolbar-height; // Make room for the height of the block toolbar above.
 		margin-right: -$block-padding;
 		margin-bottom: -$block-padding - $border-width;
 		margin-left: -$block-padding;
@@ -640,6 +665,12 @@
 			float: left;
 		}
 	}
+
+	// sth
+	&[data-align="full"] .editor-block-list__block-mobile-toolbar {
+		margin-left: 0;
+		margin-right: 0;
+	}
 }
 
 
@@ -682,11 +713,11 @@
 	height: $block-padding * 2; // Matches the whole empty space between two blocks
 	justify-content: center;
 
-	// Show a clickable plus
+	// Show a clickable plus.
 	.editor-block-list__insertion-point-button {
 		margin-top: -4px;
 		border-radius: 50%;
-		color: $dark-gray-100;
+		color: $blue-medium-focus;
 		background: $white;
 		height: $block-padding * 2 + 8px;
 		width: $block-padding * 2 + 8px;
@@ -694,29 +725,32 @@
 		&:not(:disabled):not([aria-disabled="true"]):hover {
 			box-shadow: none;
 		}
-
 	}
 
-	// Show a line indicator when hovering, but this is unclickable
-	&:before {
-		position: absolute;
-		top: calc( 50% - #{ $border-width } );
-		height: 2px;
-		left: 0;
-		right: 0;
-		background: $dark-gray-100;
-		content: '';
-	}
-
-	// Hide both the line and button until hovered
+	// Hide both the button until hovered.
 	opacity: 0;
 	transition: opacity 0.1s linear 0.1s;
 
-	&:hover, &.is-visible {
+	&:hover,
+	&.is-visible {
 		opacity: 1;
 	}
 }
 
+// Don't show the sibling inserter before the selected block.
+.edit-post-layout:not( .has-fixed-toolbar ) {
+	// The child selector is necessary for this to work properly in nested contexts.
+	.is-selected > .editor-block-list__insertion-point > .editor-block-list__insertion-point-inserter {
+		opacity: 0;
+		pointer-events: none;
+
+		&.is-visible {
+			opacity: 1;
+			pointer-events: auto;
+		}
+	}
+}
+
 .editor-block-list__block {
 	> .editor-block-list__insertion-point {
 		position: absolute;
@@ -771,18 +805,26 @@
 	left: $block-padding;
 	right: $block-padding;
 
+	@include break-small() {
+		top: -$border-width;
+	}
+
 	// Position the contextual toolbar above the block.
 	@include break-mobile() {
-		position: sticky;
+		position: relative;
+		top: auto;
 		bottom: auto;
 		left: auto;
 		right: auto;
 		margin-top: -$block-toolbar-height - $border-width;
 		margin-bottom: $block-padding + $border-width;
-	}
 
-	@include break-small() {
-		top: -$border-width;
+		// IE11 does not support `position: sticky`.
+		@supports (position: sticky) {
+			position: sticky;
+			// Avoid appearance of double border when toolbar sticks at the top of the editor.
+			top: -$border-width;
+		}
 	}
 
 	// Floated items have special needs for the contextual toolbar position.
@@ -853,7 +895,11 @@
 	z-index: z-index( '.editor-block-list__breadcrumb' );
 
 	// Position in the top right of the border
-	right: -$block-parent-side-ui-clearance;
+	right: -$block-side-ui-clearance;
+
+	@include break-small() {
+		right: -$block-parent-side-ui-clearance;
+	}
 	top: 0;
 
 	// Nested
@@ -871,7 +917,7 @@
 		padding: 4px 4px;
 		background: theme( outlines );
 		color: $white;
-	
+
 		// Animate in
 		.editor-block-list__block:hover & {
 			@include fade_in( .1s );
diff --git a/editor/components/block-preview/index.js b/editor/components/block-preview/index.js
index 104e885ce6744..a5aae1cbdc3d4 100644
--- a/editor/components/block-preview/index.js
+++ b/editor/components/block-preview/index.js
@@ -7,56 +7,37 @@ import { noop } from 'lodash';
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
-import { Component } from '@wordpress/element';
 import { createBlock } from '@wordpress/blocks';
 
 /**
  * Internal dependencies
  */
 import BlockEdit from '../block-edit';
-import { createInnerBlockList } from '../../utils/block-list';
 import './style.scss';
 
 /**
  * Block Preview Component: It renders a preview given a block name and attributes.
  *
- * @param   {Object}    props Component props.
- * @return {WPElement}       Rendered element.
+ * @param {Object} props Component props.
+ *
+ * @return {WPElement} Rendered element.
  */
-class BlockPreview extends Component {
-	getChildContext() {
-		// Blocks may render their own BlockEdit, in which case we must provide
-		// a mechanism for them to create their own InnerBlockList. BlockEdit
-		// is defined in `@wordpress/blocks`, so to avoid a circular dependency
-		// we inject this function via context.
-		return {
-			createInnerBlockList,
-		};
-	}
-
-	render() {
-		const { name, attributes } = this.props;
-
-		const block = createBlock( name, attributes );
-
-		return (
-			<div className="editor-block-preview">
-				<div className="editor-block-preview__title">{ __( 'Preview' ) }</div>
-				<div className="editor-block-preview__content">
-					<BlockEdit
-						name={ name }
-						focus={ false }
-						attributes={ block.attributes }
-						setAttributes={ noop }
-					/>
-				</div>
+function BlockPreview( { name, attributes } ) {
+	const block = createBlock( name, attributes );
+
+	return (
+		<div className="editor-block-preview">
+			<div className="editor-block-preview__title">{ __( 'Preview' ) }</div>
+			<div className="editor-block-preview__content">
+				<BlockEdit
+					name={ name }
+					focus={ false }
+					attributes={ block.attributes }
+					setAttributes={ noop }
+				/>
 			</div>
-		);
-	}
+		</div>
+	);
 }
 
-BlockPreview.childContextTypes = {
-	createInnerBlockList: noop,
-};
-
 export default BlockPreview;
diff --git a/editor/components/colors/with-colors-deprecated.js b/editor/components/colors/with-colors-deprecated.js
new file mode 100644
index 0000000000000..e55dbd6e5b51c
--- /dev/null
+++ b/editor/components/colors/with-colors-deprecated.js
@@ -0,0 +1,91 @@
+/**
+ * External dependencies
+ */
+import memoize from 'memize';
+import { get } from 'lodash';
+
+/**
+ * WordPress dependencies
+ */
+import { createHigherOrderComponent, Component, compose } from '@wordpress/element';
+import { withSelect } from '@wordpress/data';
+
+/**
+ * Internal dependencies
+ */
+import { getColorValue, getColorClass, setColorValue } from './utils';
+
+const DEFAULT_COLORS = [];
+
+/**
+ * Higher-order component, which handles color logic for class generation
+ * color value, retrieval and color attribute setting.
+ *
+ * @param {Function} mapGetSetColorToProps Function that receives getColor, setColor, and props,
+ *                                         and returns additional props to pass to the component.
+ *
+ * @return {Function} Higher-order component.
+ */
+export default ( mapGetSetColorToProps ) => createHigherOrderComponent(
+	compose( [
+		withSelect(
+			( select ) => {
+				const settings = select( 'core/editor' ).getEditorSettings();
+				return {
+					colors: get( settings, [ 'colors' ], DEFAULT_COLORS ),
+				};
+			} ),
+		( WrappedComponent ) => {
+			return class extends Component {
+				constructor() {
+					super( ...arguments );
+					/**
+					* Even though we don't expect setAttributes or colors to change memoizing it is essential.
+					* If setAttributes or colors are not memoized, each time memoizedGetColor/memoizedSetColor are called:
+					* a new function reference is returned (even if arguments have not changed).
+					* This would make our memoized chain useless.
+					*/
+					this.memoizedGetColor = memoize( this.memoizedGetColor, { maxSize: 1 } );
+					this.memoizedSetColor = memoize( this.memoizedSetColor, { maxSize: 1 } );
+				}
+
+				memoizedGetColor( colors ) {
+					return memoize(
+						( colorName, customColorValue, colorContext ) => {
+							return {
+								name: colorName,
+								class: getColorClass( colorContext, colorName ),
+								value: getColorValue( colors, colorName, customColorValue ),
+							};
+						}
+					);
+				}
+
+				memoizedSetColor( setAttributes, colors ) {
+					return memoize(
+						( colorNameAttribute, customColorAttribute ) => {
+							return setColorValue( colors, colorNameAttribute, customColorAttribute, setAttributes );
+						}
+					);
+				}
+
+				render() {
+					return (
+						<WrappedComponent
+							{ ...{
+								...this.props,
+								colors: undefined,
+								...mapGetSetColorToProps(
+									this.memoizedGetColor( this.props.colors ),
+									this.memoizedSetColor( this.props.setAttributes, this.props.colors ),
+									this.props
+								),
+							} }
+						/>
+					);
+				}
+			};
+		},
+	] ),
+	'withColors'
+);
diff --git a/editor/components/colors/with-colors.js b/editor/components/colors/with-colors.js
index 6d51e4f02b0cc..d02c4f7978a7b 100644
--- a/editor/components/colors/with-colors.js
+++ b/editor/components/colors/with-colors.js
@@ -1,19 +1,20 @@
 /**
  * External dependencies
  */
-import memoize from 'memize';
-import { get } from 'lodash';
+import { find, get, isFunction, isString, kebabCase, reduce, upperFirst } from 'lodash';
 
 /**
  * WordPress dependencies
  */
 import { createHigherOrderComponent, Component, compose } from '@wordpress/element';
 import { withSelect } from '@wordpress/data';
+import { deprecated } from '@wordpress/utils';
 
 /**
  * Internal dependencies
  */
-import { getColorValue, getColorClass, setColorValue } from './utils';
+import { getColorValue, getColorClass } from './utils';
+import withColorsDeprecated from './with-colors-deprecated';
 
 const DEFAULT_COLORS = [];
 
@@ -21,71 +22,114 @@ const DEFAULT_COLORS = [];
  * Higher-order component, which handles color logic for class generation
  * color value, retrieval and color attribute setting.
  *
- * @param {Function} mapGetSetColorToProps Function that receives getColor, setColor, and props,
- *                                         and returns additional props to pass to the component.
+ * @param {...(object|string)} args The arguments can be strings or objects. If the argument is an object,
+ *                                  it should contain the color attribute name as key and the color context as value.
+ *                                  If the argument is a string the value should be the color attribute name,
+ *                                  the color context is computed by applying a kebab case transform to the value.
+ *                                  Color context represents the context/place where the color is going to be used.
+ *                                  The class name of the color is generated using 'has' followed by the color name
+ *                                  and ending with the color context all in kebab case e.g: has-green-background-color.
+ *
  *
  * @return {Function} Higher-order component.
  */
-export default ( mapGetSetColorToProps ) => createHigherOrderComponent(
-	compose( [
-		withSelect(
-			( select ) => {
+export default ( ...args ) => {
+	if ( isFunction( args[ 0 ] ) ) {
+		deprecated( 'Using withColors( mapGetSetColorToProps ) ', {
+			version: '3.3',
+			alternative: 'withColors( colorAttributeName, { secondColorAttributeName: \'color-context\' }, ... )',
+		} );
+		return withColorsDeprecated( args[ 0 ] );
+	}
+
+	const colorMap = reduce( args, ( colorObject, arg ) => {
+		return {
+			...colorObject,
+			...( isString( arg ) ? { [ arg ]: kebabCase( arg ) } : arg ),
+		};
+	}, {} );
+
+	return createHigherOrderComponent(
+		compose( [
+			withSelect( ( select ) => {
 				const settings = select( 'core/editor' ).getEditorSettings();
 				return {
 					colors: get( settings, [ 'colors' ], DEFAULT_COLORS ),
 				};
 			} ),
-		( WrappedComponent ) => {
-			return class extends Component {
-				constructor() {
-					super( ...arguments );
-					/**
-					* Even though, we don't expect setAttributes or colors to change memoizing it is essential.
-					* If setAttributes or colors are not memoized, each time memoizedGetColor/memoizedSetColor are called:
-					* a new function reference is returned (even if arguments have not changed).
-					* This would make our memoized chain useless.
-					*/
-					this.memoizedGetColor = memoize( this.memoizedGetColor, { maxSize: 1 } );
-					this.memoizedSetColor = memoize( this.memoizedSetColor, { maxSize: 1 } );
-				}
+			( WrappedComponent ) => {
+				return class extends Component {
+					constructor( props ) {
+						super( props );
+
+						this.setters = this.createSetters();
 
-				memoizedGetColor( colors ) {
-					return memoize(
-						( colorName, customColorValue, colorContext ) => {
-							return {
-								name: colorName,
-								class: getColorClass( colorContext, colorName ),
-								value: getColorValue( colors, colorName, customColorValue ),
-							};
-						}
-					);
-				}
+						this.state = {};
+					}
 
-				memoizedSetColor( setAttributes, colors ) {
-					return memoize(
-						( colorNameAttribute, customColorAttribute ) => {
-							return setColorValue( colors, colorNameAttribute, customColorAttribute, setAttributes );
-						}
-					);
-				}
+					createSetters() {
+						return reduce( colorMap, ( settersAccumulator, colorContext, colorAttributeName ) => {
+							const upperFirstColorAttributeName = upperFirst( colorAttributeName );
+							const customColorAttributeName = `custom${ upperFirstColorAttributeName }`;
+							settersAccumulator[ `set${ upperFirstColorAttributeName }` ] =
+								this.createSetColor( colorAttributeName, customColorAttributeName );
+							return settersAccumulator;
+						}, {} );
+					}
 
-				render() {
-					return (
-						<WrappedComponent
-							{ ...{
-								...this.props,
-								colors: undefined,
-								...mapGetSetColorToProps(
-									this.memoizedGetColor( this.props.colors ),
-									this.memoizedSetColor( this.props.setAttributes, this.props.colors ),
-									this.props
-								),
-							} }
-						/>
-					);
-				}
-			};
-		},
-	] ),
-	'withColors'
-);
+					createSetColor( colorAttributeName, customColorAttributeName ) {
+						return ( colorValue ) => {
+							const colorObject = find( this.props.colors, { color: colorValue } );
+							this.props.setAttributes( {
+								[ colorAttributeName ]: colorObject && colorObject.name ? colorObject.name : undefined,
+								[ customColorAttributeName ]: colorObject && colorObject.name ? undefined : colorValue,
+							} );
+						};
+					}
+
+					static getDerivedStateFromProps( { attributes, colors }, previousState ) {
+						return reduce( colorMap, ( newState, colorContext, colorAttributeName ) => {
+							const colorName = attributes[ colorAttributeName ];
+							const colorValue = getColorValue(
+								colors,
+								colorName,
+								attributes[ `custom${ upperFirst( colorAttributeName ) }` ]
+							);
+							const previousColorObject = previousState[ colorAttributeName ];
+							const previousColorValue = get( previousColorObject, [ 'value' ] );
+							/**
+							* The "and previousColorObject" condition checks that a previous color object was already computed.
+							* At the start previousColorObject and colorValue are both equal to undefined
+							* bus as previousColorObject does not exist we should compute the object.
+							*/
+							if ( previousColorValue === colorValue && previousColorObject ) {
+								newState[ colorAttributeName ] = previousColorObject;
+							} else {
+								newState[ colorAttributeName ] = {
+									name: colorName,
+									class: getColorClass( colorContext, colorName ),
+									value: colorValue,
+								};
+							}
+							return newState;
+						}, {} );
+					}
+
+					render() {
+						return (
+							<WrappedComponent
+								{ ...{
+									...this.props,
+									colors: undefined,
+									...this.state,
+									...this.setters,
+								} }
+							/>
+						);
+					}
+				};
+			},
+		] ),
+		'withColors'
+	);
+};
diff --git a/editor/components/default-block-appender/index.js b/editor/components/default-block-appender/index.js
index 5a844824ba62b..292a4fc89ec29 100644
--- a/editor/components/default-block-appender/index.js
+++ b/editor/components/default-block-appender/index.js
@@ -59,7 +59,7 @@ export function DefaultBlockAppender( {
 			<InserterWithShortcuts rootUID={ rootUID } layout={ layout } />
 			<Inserter position="top right">
 				<DotTip id="core/editor.inserter">
-					{ __( 'Welcome to the wonderful world of blocks! Click ‘Add block’ to insert different kinds of content—text, images, quotes, video, lists, and much more.' ) }
+					{ __( 'Welcome to the wonderful world of blocks! Click the “+” (“Add block”) button to add a new block. There are blocks available for all kind of content: you can insert text, headings, images, lists, and lots more!' ) }
 				</DotTip>
 			</Inserter>
 		</div>
diff --git a/editor/components/default-block-appender/style.scss b/editor/components/default-block-appender/style.scss
index 68c229dfaa9cc..3a5c27b33580e 100644
--- a/editor/components/default-block-appender/style.scss
+++ b/editor/components/default-block-appender/style.scss
@@ -74,7 +74,7 @@ $empty-paragraph-height: $text-editor-font-size * 4;
 	right: $item-spacing;	// show on the right on mobile
 
 	@include break-small {
-		left: -$icon-button-size - $block-side-ui-clearance - $block-parent-side-ui-clearance;
+		left: -$block-side-ui-width - $block-padding - $block-side-ui-clearance;
 		right: auto;
 	}
 
@@ -85,6 +85,10 @@ $empty-paragraph-height: $text-editor-font-size * 4;
 	.editor-inserter__toggle {
 		transition: opacity 0.2s;
 		border-radius: 50%;
+		width: $block-side-ui-width;
+		height: $block-side-ui-width;
+		top: 4px;
+		padding: 4px;
 
 		// use opacity to work in various editor styles
 		&:not( :hover ) {
diff --git a/editor/components/default-block-appender/test/__snapshots__/index.js.snap b/editor/components/default-block-appender/test/__snapshots__/index.js.snap
index 9fee0c9ce14b7..61f115611b1b0 100644
--- a/editor/components/default-block-appender/test/__snapshots__/index.js.snap
+++ b/editor/components/default-block-appender/test/__snapshots__/index.js.snap
@@ -42,7 +42,7 @@ exports[`DefaultBlockAppender should append a default block when input focused 1
     <WithSelect(WithDispatch(DotTip))
       id="core/editor.inserter"
     >
-      Welcome to the wonderful world of blocks! Click ‘Add block’ to insert different kinds of content—text, images, quotes, video, lists, and much more.
+      Welcome to the wonderful world of blocks! Click the “+” (“Add block”) button to add a new block. There are blocks available for all kind of content: you can insert text, headings, images, lists, and lots more!
     </WithSelect(WithDispatch(DotTip))>
   </WithSelect(WithDispatch(Inserter))>
 </div>
@@ -72,7 +72,7 @@ exports[`DefaultBlockAppender should match snapshot 1`] = `
     <WithSelect(WithDispatch(DotTip))
       id="core/editor.inserter"
     >
-      Welcome to the wonderful world of blocks! Click ‘Add block’ to insert different kinds of content—text, images, quotes, video, lists, and much more.
+      Welcome to the wonderful world of blocks! Click the “+” (“Add block”) button to add a new block. There are blocks available for all kind of content: you can insert text, headings, images, lists, and lots more!
     </WithSelect(WithDispatch(DotTip))>
   </WithSelect(WithDispatch(Inserter))>
 </div>
@@ -102,7 +102,7 @@ exports[`DefaultBlockAppender should optionally show without prompt 1`] = `
     <WithSelect(WithDispatch(DotTip))
       id="core/editor.inserter"
     >
-      Welcome to the wonderful world of blocks! Click ‘Add block’ to insert different kinds of content—text, images, quotes, video, lists, and much more.
+      Welcome to the wonderful world of blocks! Click the “+” (“Add block”) button to add a new block. There are blocks available for all kind of content: you can insert text, headings, images, lists, and lots more!
     </WithSelect(WithDispatch(DotTip))>
   </WithSelect(WithDispatch(Inserter))>
 </div>
diff --git a/editor/components/document-title/index.js b/editor/components/document-title/index.js
index 9677e5502b7c6..1f4934060773b 100644
--- a/editor/components/document-title/index.js
+++ b/editor/components/document-title/index.js
@@ -14,17 +14,13 @@ class DocumentTitle extends Component {
 		this.originalDocumentTitle = document.title;
 	}
 
-	setDocumentTitle( title ) {
-		document.title = title + ' | ' + this.originalDocumentTitle;
-	}
-
 	componentDidMount() {
 		this.setDocumentTitle( this.props.title );
 	}
 
-	componentWillReceiveProps( nextProps ) {
-		if ( nextProps.title !== this.props.title ) {
-			this.setDocumentTitle( nextProps.title );
+	componentDidUpdate( prevProps ) {
+		if ( prevProps.title !== this.props.title ) {
+			this.setDocumentTitle( this.props.title );
 		}
 	}
 
@@ -32,6 +28,10 @@ class DocumentTitle extends Component {
 		document.title = this.originalDocumentTitle;
 	}
 
+	setDocumentTitle( title ) {
+		document.title = title + ' | ' + this.originalDocumentTitle;
+	}
+
 	render() {
 		return null;
 	}
diff --git a/editor/components/inner-blocks/README.md b/editor/components/inner-blocks/README.md
index 331fffa6a4b8d..381791a2abb42 100644
--- a/editor/components/inner-blocks/README.md
+++ b/editor/components/inner-blocks/README.md
@@ -12,7 +12,8 @@ In a block's `edit` implementation, simply render `InnerBlocks`, optionally with
 Then, in the `save` implementation, render `InnerBlocks.Content`. This will be replaced automatically with the content of the nested blocks.
 
 ```jsx
-import { registerBlockType, InnerBlocks } from '@wordpress/blocks';
+import { registerBlockType } from '@wordpress/blocks';
+import { InnerBlocks } from '@wordpress/editor';
 
 registerBlockType( 'my-plugin/my-block', {
 	// ...
diff --git a/editor/components/inner-blocks/index.js b/editor/components/inner-blocks/index.js
index 04399b3dcbe61..8bc74b886c200 100644
--- a/editor/components/inner-blocks/index.js
+++ b/editor/components/inner-blocks/index.js
@@ -1,6 +1,7 @@
 /**
  * External dependencies
  */
+import { isEqual, pick } from 'lodash';
 import classnames from 'classnames';
 
 /**
@@ -8,43 +9,100 @@ import classnames from 'classnames';
  */
 import { withContext } from '@wordpress/components';
 import { withViewportMatch } from '@wordpress/viewport';
-import { compose } from '@wordpress/element';
-import { withSelect } from '@wordpress/data';
+import { Component, compose } from '@wordpress/element';
+import { withSelect, withDispatch } from '@wordpress/data';
+import { synchronizeBlocksWithTemplate } from '@wordpress/blocks';
 
 /**
  * Internal dependencies
  */
 import './style.scss';
+import BlockList from '../block-list';
+import { withBlockEditContext } from '../block-edit/context';
 
-function InnerBlocks( {
-	BlockList,
-	layouts,
-	allowedBlocks,
-	template,
-	isSmallScreen,
-	isSelectedBlockInRoot,
-} ) {
-	const classes = classnames( 'editor-inner-blocks', {
-		'has-overlay': isSmallScreen && ! isSelectedBlockInRoot,
-	} );
-
-	return (
-		<div className={ classes }>
-			<BlockList { ...{ layouts, allowedBlocks, template } } />
-		</div>
-	);
+class InnerBlocks extends Component {
+	componentWillReceiveProps( nextProps ) {
+		this.updateNestedSettings( {
+			supportedBlocks: nextProps.allowedBlocks,
+		} );
+	}
+
+	componentDidMount() {
+		this.updateNestedSettings( {
+			supportedBlocks: this.props.allowedBlocks,
+		} );
+		this.insertTemplateBlocks( this.props.template );
+	}
+
+	insertTemplateBlocks( template ) {
+		const { block, insertBlocks } = this.props;
+		if ( template && ! block.innerBlocks.length ) {
+			// synchronizeBlocksWithTemplate( [], template ) parses the template structure,
+			// and returns/creates the necessary blocks to represent it.
+			insertBlocks( synchronizeBlocksWithTemplate( [], template ) );
+		}
+	}
+
+	updateNestedSettings( newSettings ) {
+		if ( ! isEqual( this.props.blockListSettings, newSettings ) ) {
+			this.props.updateNestedSettings( newSettings );
+		}
+	}
+
+	render() {
+		const {
+			uid,
+			layouts,
+			allowedBlocks,
+			template,
+			isSmallScreen,
+			isSelectedBlockInRoot,
+		} = this.props;
+
+		const classes = classnames( 'editor-inner-blocks', {
+			'has-overlay': isSmallScreen && ! isSelectedBlockInRoot,
+		} );
+
+		return (
+			<div className={ classes }>
+				<BlockList
+					rootUID={ uid }
+					{ ...{ layouts, allowedBlocks, template } }
+				/>
+			</div>
+		);
+	}
 }
 
 InnerBlocks = compose( [
-	withContext( 'BlockList' )(),
-	withContext( 'uid' )(),
+	withBlockEditContext( ( context ) => pick( context, [ 'uid' ] ) ),
 	withViewportMatch( { isSmallScreen: '< medium' } ),
 	withSelect( ( select, ownProps ) => {
-		const { isBlockSelected, hasSelectedInnerBlock } = select( 'core/editor' );
+		const {
+			isBlockSelected,
+			hasSelectedInnerBlock,
+			getBlock,
+			getBlockListSettings,
+		} = select( 'core/editor' );
 		const { uid } = ownProps;
 
 		return {
 			isSelectedBlockInRoot: isBlockSelected( uid ) || hasSelectedInnerBlock( uid ),
+			block: getBlock( uid ),
+			blockListSettings: getBlockListSettings( uid ),
+		};
+	} ),
+	withDispatch( ( dispatch, ownProps ) => {
+		const { insertBlocks, updateBlockListSettings } = dispatch( 'core/editor' );
+		const { uid } = ownProps;
+
+		return {
+			insertBlocks( blocks ) {
+				dispatch( insertBlocks( blocks, undefined, uid ) );
+			},
+			updateNestedSettings( settings ) {
+				dispatch( updateBlockListSettings( uid, settings ) );
+			},
 		};
 	} ),
 ] )( InnerBlocks );
diff --git a/editor/components/inserter-with-shortcuts/index.js b/editor/components/inserter-with-shortcuts/index.js
index c9fa5db554e92..83c282ad594ab 100644
--- a/editor/components/inserter-with-shortcuts/index.js
+++ b/editor/components/inserter-with-shortcuts/index.js
@@ -23,9 +23,12 @@ function InserterWithShortcuts( { items, isLocked, onInsert } ) {
 		return null;
 	}
 
-	const itemsWithoutDefaultBlock = filter( items, ( item ) =>
-		item.name !== getDefaultBlockName() || ! isEmpty( item.initialAttributes )
-	).slice( 0, 3 );
+	const itemsWithoutDefaultBlock = filter( items, ( item ) => {
+		return ! item.isDisabled && (
+			item.name !== getDefaultBlockName() ||
+			! isEmpty( item.initialAttributes )
+		);
+	} ).slice( 0, 3 );
 
 	return (
 		<div className="editor-inserter-with-shortcuts">
@@ -34,6 +37,7 @@ function InserterWithShortcuts( { items, isLocked, onInsert } ) {
 					key={ item.id }
 					className="editor-inserter-with-shortcuts__block"
 					onClick={ () => onInsert( item ) }
+					// translators: %s: block title/name to be added
 					label={ sprintf( __( 'Add %s' ), item.title ) }
 					icon={ (
 						<BlockIcon icon={ item.icon && item.icon.src } />
diff --git a/editor/components/inserter/child-blocks.js b/editor/components/inserter/child-blocks.js
index c2a2da56e0db0..80fed8f9e311d 100644
--- a/editor/components/inserter/child-blocks.js
+++ b/editor/components/inserter/child-blocks.js
@@ -17,17 +17,7 @@ function ChildBlocks( { rootBlockIcon, rootBlockTitle, items, ...props } ) {
 		<div className="editor-inserter__child-blocks">
 			{ ( rootBlockIcon || rootBlockTitle ) && (
 				<div className="editor-inserter__parent-block-header">
-					{ rootBlockIcon && (
-						<div
-							style={ {
-								backgroundColor: rootBlockIcon.background,
-								color: rootBlockIcon.foreground,
-							} }
-							className="editor-inserter__parent-block-icon"
-						>
-							<BlockIcon icon={ rootBlockIcon.src } />
-						</div>
-					) }
+					<BlockIcon icon={ rootBlockIcon } showColors />
 					{ rootBlockTitle && <h2>{ rootBlockTitle }</h2> }
 				</div>
 			) }
diff --git a/editor/components/inserter/style.scss b/editor/components/inserter/style.scss
index bf097e2c71bfe..935da57bd754c 100644
--- a/editor/components/inserter/style.scss
+++ b/editor/components/inserter/style.scss
@@ -84,13 +84,17 @@ $block-inserter-search-height: 38px;
 
 	@include break-medium {
 		height: $block-inserter-content-height + $block-inserter-tabs-height;
-		box-shadow: inset 0 -5px 5px -4px rgba( $dark-gray-900, .1 );
 	}
 
 	// Don't show the top border on the first panel, let the Search border be the border.
 	.components-panel__body:first-child {
 		border-top: none;
 	}
+
+	// Don't show the bottom border on the last panel, let the library itself show the border.
+	.components-panel__body:last-child {
+		border-bottom: none;
+	}
 }
 
 .editor-inserter__list {
@@ -212,12 +216,3 @@ $block-inserter-search-height: 38px;
 		font-size: 13px;
 	}
 }
-
-.editor-inserter__parent-block-icon {
-	background: $light-gray-200;
-	border-radius: 4px;
-	display: flex;
-	margin-left: -2px;
-	margin-right: 10px;
-	padding: 0 8px;
-}
diff --git a/editor/components/media-placeholder/index.js b/editor/components/media-placeholder/index.js
index de4b76c93907b..bf60240199359 100644
--- a/editor/components/media-placeholder/index.js
+++ b/editor/components/media-placeholder/index.js
@@ -92,6 +92,7 @@ class MediaPlaceholder extends Component {
 			<Placeholder
 				icon={ icon }
 				label={ labels.title }
+				// translators: %s: media name label e.g: "an audio","an image", "a video"
 				instructions={ sprintf( __( 'Drag %s, upload a new one or select a file from your library.' ), labels.name ) }
 				className={ classnames( 'editor-media-placeholder', className ) }
 				notices={ notices }
diff --git a/editor/components/media-upload/README.md b/editor/components/media-upload/README.md
index ce9a748535446..d54dccb4d699d 100644
--- a/editor/components/media-upload/README.md
+++ b/editor/components/media-upload/README.md
@@ -14,8 +14,8 @@ import MediaUpload from './media-upload';
 const replaceMediaUpload = () => MediaUpload;
 
 addFilter(
-	'blocks.MediaUpload',
-	'core/edit-post/blocks/media-upload/replaceMediaUpload',
+	'editor.MediaUpload',
+	'core/edit-post/components/media-upload/replace-media-upload',
 	replaceMediaUpload
 );
 ```
diff --git a/editor/components/media-upload/index.js b/editor/components/media-upload/index.js
index 9485a0c856618..38743329f818f 100644
--- a/editor/components/media-upload/index.js
+++ b/editor/components/media-upload/index.js
@@ -6,11 +6,11 @@ import { withFilters } from '@wordpress/components';
 /**
  * This is a placeholder for the media upload component necessary to make it possible to provide
  * an integration with the core blocks that handle media files. By default it renders nothing but
- * it provides a way to have it overridden with the `blocks.MediaUpload` filter.
+ * it provides a way to have it overridden with the `editor.MediaUpload` filter.
  *
  * @return {WPElement} Media upload element.
  */
 const MediaUpload = () => null;
 
 // Todo: rename the filter
-export default withFilters( 'blocks.MediaUpload' )( MediaUpload );
+export default withFilters( 'editor.MediaUpload' )( MediaUpload );
diff --git a/editor/components/post-excerpt/index.js b/editor/components/post-excerpt/index.js
index b7c7c9ce088b8..9b42d9fa2477d 100644
--- a/editor/components/post-excerpt/index.js
+++ b/editor/components/post-excerpt/index.js
@@ -30,7 +30,7 @@ function PostExcerpt( { excerpt, onUpdateExcerpt } ) {
 export default compose( [
 	withSelect( ( select ) => {
 		return {
-			excerpt: select( 'core/editor' ).getEditedPostExcerpt(),
+			excerpt: select( 'core/editor' ).getEditedPostAttribute( 'excerpt' ),
 		};
 	} ),
 	withDispatch( ( dispatch ) => ( {
diff --git a/editor/components/post-featured-image/index.js b/editor/components/post-featured-image/index.js
index 5a04a43467ad0..0557e48734589 100644
--- a/editor/components/post-featured-image/index.js
+++ b/editor/components/post-featured-image/index.js
@@ -20,7 +20,7 @@ import MediaUpload from '../media-upload';
 
 // Used when labels from post type were not yet loaded or when they are not present.
 const DEFAULT_SET_FEATURE_IMAGE_LABEL = __( 'Set featured image' );
-const DEFAULT_REMOVE_FEATURE_IMAGE_LABEL = __( 'Remove featured image' );
+const DEFAULT_REMOVE_FEATURE_IMAGE_LABEL = __( 'Remove image' );
 
 function PostFeaturedImage( { featuredImageId, onUpdateImage, onRemoveImage, media, postType } ) {
 	const postLabel = get( postType, [ 'labels' ], {} );
@@ -30,12 +30,12 @@ function PostFeaturedImage( { featuredImageId, onUpdateImage, onRemoveImage, med
 			<div className="editor-post-featured-image">
 				{ !! featuredImageId &&
 					<MediaUpload
-						title={ postLabel.set_featured_image }
+						title={ __( 'Set featured image' ) }
 						onSelect={ onUpdateImage }
 						type="image"
 						modalClass="editor-post-featured-image__media-modal"
 						render={ ( { open } ) => (
-							<Button className="editor-post-featured-image__preview" onClick={ open } isLink>
+							<Button className="editor-post-featured-image__preview" onClick={ open }>
 								{ media &&
 									<ResponsiveWrapper
 										naturalWidth={ media.media_details.width }
@@ -50,25 +50,35 @@ function PostFeaturedImage( { featuredImageId, onUpdateImage, onRemoveImage, med
 					/>
 				}
 				{ !! featuredImageId && media && ! media.isLoading &&
-					<p className="editor-post-featured-image__howto">
-						{ __( 'Click the image to edit or update' ) }
-					</p>
+				<MediaUpload
+					title={ postLabel.set_featured_image || DEFAULT_SET_FEATURE_IMAGE_LABEL }
+					onSelect={ onUpdateImage }
+					type="image"
+					modalClass="editor-post-featured-image__media-modal"
+					render={ ( { open } ) => (
+						<Button onClick={ open } isDefault isLarge>
+							{ __( 'Replace image' ) }
+						</Button>
+					) }
+				/>
 				}
 				{ ! featuredImageId &&
-					<MediaUpload
-						title={ postLabel.set_featured_image || DEFAULT_SET_FEATURE_IMAGE_LABEL }
-						onSelect={ onUpdateImage }
-						type="image"
-						modalClass="editor-post-featured-image__media-modal"
-						render={ ( { open } ) => (
-							<Button className="editor-post-featured-image__toggle" onClick={ open } isLink>
-								{ postLabel.set_featured_image || DEFAULT_SET_FEATURE_IMAGE_LABEL }
-							</Button>
-						) }
-					/>
+					<div>
+						<MediaUpload
+							title={ postLabel.set_featured_image || DEFAULT_SET_FEATURE_IMAGE_LABEL }
+							onSelect={ onUpdateImage }
+							type="image"
+							modalClass="editor-post-featured-image__media-modal"
+							render={ ( { open } ) => (
+								<Button className="editor-post-featured-image__toggle" onClick={ open }>
+									{ __( 'Set featured image' ) }
+								</Button>
+							) }
+						/>
+					</div>
 				}
 				{ !! featuredImageId &&
-					<Button className="editor-post-featured-image__toggle" onClick={ onRemoveImage } isLink>
+					<Button onClick={ onRemoveImage } isLink isDestructive>
 						{ postLabel.remove_featured_image || DEFAULT_REMOVE_FEATURE_IMAGE_LABEL }
 					</Button>
 				}
diff --git a/editor/components/post-featured-image/style.scss b/editor/components/post-featured-image/style.scss
index e357b139defc7..28a832d91b2c1 100644
--- a/editor/components/post-featured-image/style.scss
+++ b/editor/components/post-featured-image/style.scss
@@ -1,33 +1,45 @@
 .editor-post-featured-image {
-	padding: 10px 0 0;
+	padding: 0;
 
 	.spinner {
 		margin: 0;
 	}
-}
-
-.editor-post-featured-image__toggle {
-	text-decoration: underline;
-	color: theme( secondary );
 
-	&:focus {
-		box-shadow: none;
-		outline: none;
+	// Space consecutive buttons evenly.
+	.components-button + .components-button {
+		margin-top: 1em;
+		margin-right: 8px;
 	}
 
-	&:hover {
-		color: theme( primary );
+	// This keeps images at their intrinsic size (eg. a 50px
+	// image will never be wider than 50px).
+	.components-responsive-wrapper__content {
+		max-width: 100%;
+		width: auto;
 	}
 }
 
+.editor-post-featured-image__toggle,
 .editor-post-featured-image__preview {
 	display: block;
 	width: 100%;
+	padding: 0;
+	transition: all .1s ease-out;
+	box-shadow: 0 0 0 0 $blue-medium-500;
 }
 
-.editor-post-featured-image__howto {
-	color: $dark-gray-300;
-	font-style: italic;
-	margin: 10px 0;
+.editor-post-featured-image__preview:not(:disabled):not([aria-disabled="true"]):focus {
+	box-shadow: 0 0 0 4px $blue-medium-500;
 }
 
+.editor-post-featured-image__toggle {
+	border: 1px dashed $light-gray-900;
+	background-color: $light-gray-300;
+	line-height: 20px;
+	padding: $item-spacing 0;
+	text-align: center;
+
+	&:hover {
+		background-color: $light-gray-100;
+	}
+}
diff --git a/editor/components/post-permalink/index.js b/editor/components/post-permalink/index.js
index b1ba0dec54c96..e81302a486cdc 100644
--- a/editor/components/post-permalink/index.js
+++ b/editor/components/post-permalink/index.js
@@ -56,11 +56,11 @@ class PostPermalink extends Component {
 	}
 
 	render() {
-		const { isNew, previewLink, isEditable, samplePermalink, isPublished } = this.props;
+		const { isNew, postLink, isEditable, samplePermalink, isPublished } = this.props;
 		const { isCopied, isEditingPermalink } = this.state;
 		const ariaLabel = isCopied ? __( 'Permalink copied' ) : __( 'Copy the permalink' );
 
-		if ( isNew || ! previewLink ) {
+		if ( isNew || ! postLink ) {
 			return null;
 		}
 
@@ -80,7 +80,7 @@ class PostPermalink extends Component {
 				{ ! isEditingPermalink &&
 					<Button
 						className="editor-post-permalink__link"
-						href={ ! isPublished ? previewLink : samplePermalink }
+						href={ ! isPublished ? postLink : samplePermalink }
 						target="_blank"
 						ref={ ( permalinkButton ) => this.permalinkButton = permalinkButton }
 					>
@@ -123,10 +123,19 @@ class PostPermalink extends Component {
 
 export default compose( [
 	withSelect( ( select ) => {
-		const { isEditedPostNew, isPermalinkEditable, getEditedPostPreviewLink, getPermalink, isCurrentPostPublished } = select( 'core/editor' );
+		const {
+			isEditedPostNew,
+			isPermalinkEditable,
+			getCurrentPost,
+			getPermalink,
+			isCurrentPostPublished,
+		} = select( 'core/editor' );
+
+		const { link } = getCurrentPost();
+
 		return {
 			isNew: isEditedPostNew(),
-			previewLink: getEditedPostPreviewLink(),
+			postLink: link,
 			isEditable: isPermalinkEditable(),
 			samplePermalink: getPermalink(),
 			isPublished: isCurrentPostPublished(),
diff --git a/editor/components/post-preview-button/index.js b/editor/components/post-preview-button/index.js
index acb2ae41a3fac..f9037ae64f810 100644
--- a/editor/components/post-preview-button/index.js
+++ b/editor/components/post-preview-button/index.js
@@ -17,26 +17,34 @@ export class PostPreviewButton extends Component {
 		super( ...arguments );
 
 		this.saveForPreview = this.saveForPreview.bind( this );
-
-		this.state = {
-			isAwaitingSave: false,
-		};
 	}
 
-	componentWillReceiveProps( nextProps ) {
-		const { modified, link } = nextProps;
-		const { isAwaitingSave } = this.state;
-		const hasFinishedSaving = (
-			isAwaitingSave &&
-			modified !== this.props.modified
-		);
+	componentDidUpdate( prevProps ) {
+		const { previewLink } = this.props;
 
-		if ( hasFinishedSaving && this.previewWindow ) {
-			this.previewWindow.location = link;
-			this.setState( { isAwaitingSave: false } );
+		// This relies on the window being responsible to unset itself when
+		// navigation occurs or a new preview window is opened, to avoid
+		// unintentional forceful redirects.
+		if ( previewLink && previewLink !== prevProps.previewLink ) {
+			this.setPreviewWindowLink( previewLink );
 		}
 	}
 
+	/**
+	 * Sets the preview window's location to the given URL, if a preview window
+	 * exists and is not already at that location.
+	 *
+	 * @param {string} url URL to assign as preview window location.
+	 */
+	setPreviewWindowLink( url ) {
+		const { previewWindow } = this;
+		if ( ! previewWindow || previewWindow.location.href === url ) {
+			return;
+		}
+
+		previewWindow.location = url;
+	}
+
 	getWindowTarget() {
 		const { postId } = this.props;
 		return `wp-preview-${ postId }`;
@@ -44,6 +52,7 @@ export class PostPreviewButton extends Component {
 
 	saveForPreview( event ) {
 		const { isDirty, isNew } = this.props;
+
 		// Let default link behavior occur if no changes to saved post
 		if ( ! isDirty && ! isNew ) {
 			return;
@@ -51,9 +60,6 @@ export class PostPreviewButton extends Component {
 
 		// Save post prior to opening window
 		this.props.autosave();
-		this.setState( {
-			isAwaitingSave: true,
-		} );
 
 		// Open a popup, BUT: Set it to a blank page until save completes. This
 		// is necessary because popups can only be opened in response to user
@@ -64,10 +70,6 @@ export class PostPreviewButton extends Component {
 			this.getWindowTarget()
 		);
 
-		// When popup is closed, delete reference to avoid later assignment of
-		// location in a post update.
-		this.previewWindow.onbeforeunload = () => delete this.previewWindow;
-
 		const markup = `
 			<div>
 				<p>Please wait&hellip;</p>
@@ -93,16 +95,20 @@ export class PostPreviewButton extends Component {
 
 		this.previewWindow.document.write( markup );
 		this.previewWindow.document.close();
+
+		// When popup is closed or redirected by setPreviewWindowLink, delete
+		// reference to avoid later assignment of location in a post update.
+		this.previewWindow.onbeforeunload = () => delete this.previewWindow;
 	}
 
 	render() {
-		const { link, isSaveable } = this.props;
+		const { currentPostLink, isSaveable } = this.props;
 
 		return (
 			<Button
 				className="editor-post-preview"
 				isLarge
-				href={ link }
+				href={ currentPostLink }
 				onClick={ this.saveForPreview }
 				target={ this.getWindowTarget() }
 				disabled={ ! isSaveable }
@@ -120,7 +126,8 @@ export default compose( [
 	withSelect( ( select ) => {
 		const {
 			getCurrentPostId,
-			getEditedPostPreviewLink,
+			getCurrentPostAttribute,
+			getAutosaveAttribute,
 			getEditedPostAttribute,
 			isEditedPostDirty,
 			isEditedPostNew,
@@ -132,12 +139,12 @@ export default compose( [
 		const postType = getPostType( getEditedPostAttribute( 'type' ) );
 		return {
 			postId: getCurrentPostId(),
-			link: getEditedPostPreviewLink(),
+			currentPostLink: getCurrentPostAttribute( 'link' ),
+			previewLink: getAutosaveAttribute( 'preview_link' ),
 			isDirty: isEditedPostDirty(),
 			isNew: isEditedPostNew(),
 			isSaveable: isEditedPostSaveable(),
 			isViewable: get( postType, [ 'viewable' ], false ),
-			modified: getEditedPostAttribute( 'modified' ),
 		};
 	} ),
 	withDispatch( ( dispatch ) => ( {
diff --git a/editor/components/post-preview-button/test/index.js b/editor/components/post-preview-button/test/index.js
index ba57148eb8aaf..9baad77fc1f1a 100644
--- a/editor/components/post-preview-button/test/index.js
+++ b/editor/components/post-preview-button/test/index.js
@@ -9,11 +9,55 @@ import { shallow } from 'enzyme';
 import { PostPreviewButton } from '../';
 
 describe( 'PostPreviewButton', () => {
-	describe( 'constructor()', () => {
-		it( 'should initialize with non-awaiting-save', () => {
-			const instance = new PostPreviewButton( {} );
+	describe( 'setPreviewWindowLink()', () => {
+		it( 'should do nothing if there is no preview window', () => {
+			const url = 'https://wordpress.org';
+			const setter = jest.fn();
+			const wrapper = shallow( <PostPreviewButton /> );
 
-			expect( instance.state.isAwaitingSave ).toBe( false );
+			wrapper.instance().setPreviewWindowLink( url );
+
+			expect( setter ).not.toHaveBeenCalled();
+		} );
+
+		it( 'should do nothing if the preview window is already at url location', () => {
+			const url = 'https://wordpress.org';
+			const setter = jest.fn();
+			const wrapper = shallow( <PostPreviewButton /> );
+			wrapper.instance().previewWindow = {
+				get location() {
+					return {
+						href: url,
+					};
+				},
+				set location( value ) {
+					setter( value );
+				},
+			};
+
+			wrapper.instance().setPreviewWindowLink( url );
+
+			expect( setter ).not.toHaveBeenCalled();
+		} );
+
+		it( 'set preview window location to url', () => {
+			const url = 'https://wordpress.org';
+			const setter = jest.fn();
+			const wrapper = shallow( <PostPreviewButton /> );
+			wrapper.instance().previewWindow = {
+				get location() {
+					return {
+						href: 'about:blank',
+					};
+				},
+				set location( value ) {
+					setter( value );
+				},
+			};
+
+			wrapper.instance().setPreviewWindowLink( url );
+
+			expect( setter ).toHaveBeenCalledWith( url );
 		} );
 	} );
 
@@ -28,23 +72,21 @@ describe( 'PostPreviewButton', () => {
 	} );
 
 	describe( 'componentDidUpdate()', () => {
-		it( 'should change popup location if save finishes', () => {
+		it( 'should change popup location if preview link is available', () => {
 			const wrapper = shallow(
 				<PostPreviewButton
 					postId={ 1 }
-					link="https://wordpress.org/?p=1"
+					currentPostLink="https://wordpress.org/?p=1"
 					isSaveable
 					modified="2017-08-03T15:05:50" />
 			);
-			wrapper.instance().previewWindow = {};
-			wrapper.setState( { isAwaitingSave: true } );
+			wrapper.instance().previewWindow = { location: {} };
 
-			wrapper.setProps( { modified: '2017-08-03T15:05:52' } );
+			wrapper.setProps( { previewLink: 'https://wordpress.org/?p=1' } );
 
 			expect(
 				wrapper.instance().previewWindow.location
 			).toBe( 'https://wordpress.org/?p=1' );
-			expect( wrapper.state( 'isAwaitingSave' ) ).toBe( false );
 		} );
 	} );
 
@@ -71,13 +113,11 @@ describe( 'PostPreviewButton', () => {
 			if ( isExpectingSave ) {
 				expect( autosave ).toHaveBeenCalled();
 				expect( preventDefault ).toHaveBeenCalled();
-				expect( wrapper.state( 'isAwaitingSave' ) ).toBe( true );
 				expect( window.open ).toHaveBeenCalled();
 				expect( wrapper.instance().previewWindow.document.write ).toHaveBeenCalled();
 			} else {
 				expect( autosave ).not.toHaveBeenCalled();
 				expect( preventDefault ).not.toHaveBeenCalled();
-				expect( wrapper.state( 'isAwaitingSave' ) ).not.toBe( true );
 				expect( window.open ).not.toHaveBeenCalled();
 			}
 
@@ -118,7 +158,7 @@ describe( 'PostPreviewButton', () => {
 				<PostPreviewButton
 					postId={ 1 }
 					isSaveable
-					link="https://wordpress.org/?p=1" />
+					currentPostLink="https://wordpress.org/?p=1" />
 			);
 
 			expect( wrapper.prop( 'href' ) ).toBe( 'https://wordpress.org/?p=1' );
@@ -130,7 +170,7 @@ describe( 'PostPreviewButton', () => {
 			const wrapper = shallow(
 				<PostPreviewButton
 					postId={ 1 }
-					link="https://wordpress.org/?p=1" />
+					currentPostLink="https://wordpress.org/?p=1" />
 			);
 
 			expect( wrapper.prop( 'disabled' ) ).toBe( true );
diff --git a/editor/components/post-publish-panel/index.js b/editor/components/post-publish-panel/index.js
index ca865d501d733..b1e1755023379 100644
--- a/editor/components/post-publish-panel/index.js
+++ b/editor/components/post-publish-panel/index.js
@@ -29,17 +29,19 @@ class PostPublishPanel extends Component {
 		};
 	}
 
-	componentWillReceiveProps( newProps ) {
+	static getDerivedStateFromProps( props, state ) {
 		if (
-			! this.state.submitted &&
-			! newProps.isSaving &&
-			( newProps.isPublished || newProps.isScheduled )
+			state.submitted ||
+			props.isSaving ||
+			( ! props.isPublished && ! props.isScheduled )
 		) {
-			this.setState( {
-				submitted: true,
-				loading: false,
-			} );
+			return null;
 		}
+
+		return {
+			submitted: true,
+			loading: false,
+		};
 	}
 
 	componentDidUpdate( prevProps ) {
diff --git a/editor/components/post-publish-panel/prepublish.js b/editor/components/post-publish-panel/prepublish.js
index 0046045a523b0..ce50a880a3d43 100644
--- a/editor/components/post-publish-panel/prepublish.js
+++ b/editor/components/post-publish-panel/prepublish.js
@@ -1,8 +1,15 @@
+/**
+ * External dependencies
+ */
+import { get } from 'lodash';
+
 /**
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
+import { Fragment } from '@wordpress/element';
 import { PanelBody } from '@wordpress/components';
+import { withSelect } from '@wordpress/data';
 
 /**
  * Internal Dependencies
@@ -12,26 +19,40 @@ import PostVisibilityLabel from '../post-visibility/label';
 import PostSchedule from '../post-schedule';
 import PostScheduleLabel from '../post-schedule/label';
 
-function PostPublishPanelPrepublish( { children } ) {
+function PostPublishPanelPrepublish( {
+	hasPublishAction,
+	children,
+} ) {
 	return (
 		<div className="editor-post-publish-panel__prepublish">
-			<div><strong>{ __( 'Are you ready to publish?' ) }</strong></div>
-			<p>{ __( 'Here, you can do a last-minute check up of your settings below, before you publish.' ) }</p>
-			<PanelBody initialOpen={ false } title={ [
-				__( 'Visibility: ' ),
-				<span className="editor-post-publish-panel__link" key="label"><PostVisibilityLabel /></span>,
-			] }>
-				<PostVisibility />
-			</PanelBody>
-			<PanelBody initialOpen={ false } title={ [
-				__( 'Publish: ' ),
-				<span className="editor-post-publish-panel__link" key="label"><PostScheduleLabel /></span>,
-			] }>
-				<PostSchedule />
-			</PanelBody>
-			{ children }
+			<div><strong>{ hasPublishAction ? __( 'Are you ready to publish?' ) : __( 'Are you ready to submit for review?' ) }</strong></div>
+			<p>{ hasPublishAction ? __( 'Here, you can do a last-minute check up of your settings below, before you publish.' ) : __( 'When you\'re ready, submit your work for review, and an Editor will be able to approve it for you.' ) }</p>
+			{ hasPublishAction && (
+				<Fragment>
+					<PanelBody initialOpen={ false } title={ [
+						__( 'Visibility: ' ),
+						<span className="editor-post-publish-panel__link" key="label"><PostVisibilityLabel /></span>,
+					] }>
+						<PostVisibility />
+					</PanelBody>
+					<PanelBody initialOpen={ false } title={ [
+						__( 'Publish: ' ),
+						<span className="editor-post-publish-panel__link" key="label"><PostScheduleLabel /></span>,
+					] }>
+						<PostSchedule />
+					</PanelBody>
+					{ children }
+				</Fragment>
+			) }
 		</div>
 	);
 }
 
-export default PostPublishPanelPrepublish;
+export default withSelect(
+	( select ) => {
+		const { getCurrentPost } = select( 'core/editor' );
+		return {
+			hasPublishAction: get( getCurrentPost(), [ '_links', 'wp:action-publish' ], false ),
+		};
+	}
+)( PostPublishPanelPrepublish );
diff --git a/editor/components/post-publish-panel/test/toggle.js b/editor/components/post-publish-panel/test/toggle.js
new file mode 100644
index 0000000000000..3226b638a3567
--- /dev/null
+++ b/editor/components/post-publish-panel/test/toggle.js
@@ -0,0 +1,75 @@
+/**
+ * External dependencies
+ */
+import { shallow } from 'enzyme';
+
+/**
+ * Internal dependencies
+ */
+import { PostPublishPanelToggle } from '../toggle';
+
+describe( 'PostPublishPanelToggle', () => {
+	describe( 'disabled', () => {
+		it( 'should be disabled if post is currently saving', () => {
+			const wrapper = shallow(
+				<PostPublishPanelToggle isSaving />
+			);
+
+			expect( wrapper.prop( 'disabled' ) ).toBe( true );
+		} );
+
+		it( 'should be disabled if post is currently force saving', () => {
+			const wrapper = shallow(
+				<PostPublishPanelToggle forceIsSaving />
+			);
+
+			expect( wrapper.prop( 'disabled' ) ).toBe( true );
+		} );
+
+		it( 'should be disabled if post is not publishable', () => {
+			const wrapper = shallow(
+				<PostPublishPanelToggle isPublishable={ false } />
+			);
+
+			expect( wrapper.prop( 'disabled' ) ).toBe( true );
+		} );
+
+		it( 'should be disabled if post is not saveable', () => {
+			const wrapper = shallow(
+				<PostPublishPanelToggle isSaveable={ false } />
+			);
+
+			expect( wrapper.prop( 'disabled' ) ).toBe( true );
+		} );
+
+		it( 'should be disabled if post is not published', () => {
+			const wrapper = shallow(
+				<PostPublishPanelToggle isPublished={ false } />
+			);
+
+			expect( wrapper.prop( 'disabled' ) ).toBe( true );
+		} );
+
+		it( 'should be enabled otherwise', () => {
+			const wrapper = shallow(
+				<PostPublishPanelToggle isPublishable isSaveable />
+			);
+
+			expect( wrapper.prop( 'disabled' ) ).toBe( false );
+		} );
+
+		it( 'should display Schedule… if able to be scheduled', () => {
+			const wrapper = shallow(
+				<PostPublishPanelToggle isPublishable isSaveable isBeingScheduled />
+			);
+			expect( wrapper.childAt( 0 ).text() ).toBe( 'Schedule…' );
+		} );
+
+		it( 'should display Publish… if able to be published', () => {
+			const wrapper = shallow(
+				<PostPublishPanelToggle isPublishable isSaveable hasPublishAction />
+			);
+			expect( wrapper.childAt( 0 ).text() ).toBe( 'Publish…' );
+		} );
+	} );
+} );
diff --git a/editor/components/post-publish-panel/toggle.js b/editor/components/post-publish-panel/toggle.js
index 736b08f67a48a..f51eebebd7fb2 100644
--- a/editor/components/post-publish-panel/toggle.js
+++ b/editor/components/post-publish-panel/toggle.js
@@ -17,7 +17,7 @@ import { DotTip } from '@wordpress/nux';
  */
 import PostPublishButton from '../post-publish-button';
 
-function PostPublishPanelToggle( {
+export function PostPublishPanelToggle( {
 	hasPublishAction,
 	isSaving,
 	isPublishable,
diff --git a/editor/components/post-taxonomies/flat-term-selector.js b/editor/components/post-taxonomies/flat-term-selector.js
index 4931ca7fb5f2d..f73ba815cbac5 100644
--- a/editor/components/post-taxonomies/flat-term-selector.js
+++ b/editor/components/post-taxonomies/flat-term-selector.js
@@ -67,9 +67,9 @@ class FlatTermSelector extends Component {
 		invoke( this.searchRequest, [ 'abort' ] );
 	}
 
-	componentWillReceiveProps( newProps ) {
-		if ( newProps.terms !== this.props.terms ) {
-			this.updateSelectedTerms( newProps.terms );
+	componentDidUpdate( prevProps ) {
+		if ( prevProps.terms !== this.props.terms ) {
+			this.updateSelectedTerms( this.props.terms );
 		}
 	}
 
diff --git a/editor/components/post-text-editor/index.js b/editor/components/post-text-editor/index.js
index f3f86488c1ca6..cb3bf75617309 100644
--- a/editor/components/post-text-editor/index.js
+++ b/editor/components/post-text-editor/index.js
@@ -18,6 +18,21 @@ import { withInstanceId } from '@wordpress/components';
  */
 import './style.scss';
 
+/**
+ * Returns the PostTextEditor state given a set of props.
+ *
+ * @param {Object} props Component props.
+ *
+ * @return {Object} State object.
+ */
+function computeDerivedState( props ) {
+	return {
+		persistedValue: props.value,
+		value: props.value,
+		isDirty: false,
+	};
+}
+
 class PostTextEditor extends Component {
 	constructor() {
 		super( ...arguments );
@@ -32,12 +47,14 @@ class PostTextEditor extends Component {
 		};
 	}
 
-	componentWillReceiveProps( nextProps ) {
+	static getDerivedPropsFromState( props, state ) {
 		// If we receive a new value while we're editing (but before we've made
 		// changes), go ahead and clobber the local state
-		if ( this.props.value !== nextProps.value && this.state.value && ! this.state.isDirty ) {
-			this.setState( { value: nextProps.value } );
+		if ( state.persistedValue !== props.value && ! state.isDirty ) {
+			return computeDerivedState( props );
 		}
+
+		return null;
 	}
 
 	startEditing() {
diff --git a/editor/components/post-title/style.scss b/editor/components/post-title/style.scss
index 76a5fc757ad9b..de84d289ee0bf 100644
--- a/editor/components/post-title/style.scss
+++ b/editor/components/post-title/style.scss
@@ -9,15 +9,29 @@
 	.editor-post-title__input {
 		display: block;
 		width: 100%;
-		padding: #{ $block-padding + 5px } $parent-block-padding;
 		margin: 0;
 		box-shadow: none;
-		border: 1px solid transparent;
 		background: transparent;
 		font-family: $editor-font;
 		line-height: $default-line-height;
 		transition: border .1s ease-out;
 
+		// Show wider parent padding on Desktop breakpoints.
+		padding: #{ $block-padding + 5px } $block-padding;
+
+		@include break-small() {
+			padding: #{ $block-padding + 5px } $parent-block-padding;
+		}
+
+		// Stack borders on mobile.
+		border: 1px solid transparent;
+		border-left-width: 0;
+		border-right-width: 0;
+
+		@include break-small() {
+			border-width: 1px;
+		}
+
 		// Match h1 heading
 		font-size: 2.441em;
 		font-weight: 600;
diff --git a/editor/components/preserve-scroll-in-reorder/index.js b/editor/components/preserve-scroll-in-reorder/index.js
index b39b4496db3a0..92fa7941be6e3 100644
--- a/editor/components/preserve-scroll-in-reorder/index.js
+++ b/editor/components/preserve-scroll-in-reorder/index.js
@@ -21,16 +21,18 @@ import { getBlockDOMNode } from '../../utils/dom';
  * ```
  */
 class PreserveScrollInReorder extends Component {
-	componentWillUpdate( nextProps ) {
-		const { blockOrder, selectionStart } = nextProps;
-		if ( blockOrder !== this.props.blockOrder && selectionStart ) {
-			this.setPreviousOffset( selectionStart );
+	getSnapshotBeforeUpdate( prevProps ) {
+		const { blockOrder, selectionStart } = this.props;
+		if ( blockOrder !== prevProps.blockOrder && selectionStart ) {
+			return this.getOffset( selectionStart );
 		}
+
+		return null;
 	}
 
-	componentDidUpdate() {
-		if ( this.previousOffset ) {
-			this.restorePreviousOffset();
+	componentDidUpdate( prevProps, prevState, snapshot ) {
+		if ( snapshot ) {
+			this.restorePreviousOffset( snapshot );
 		}
 	}
 
@@ -39,32 +41,33 @@ class PreserveScrollInReorder extends Component {
 	 * top offset as an instance property before a reorder is to occur.
 	 *
 	 * @param {string} selectionStart UID of selected block.
+	 *
+	 * @return {number?} The scroll offset.
 	 */
-	setPreviousOffset( selectionStart ) {
+	getOffset( selectionStart ) {
 		const blockNode = getBlockDOMNode( selectionStart );
 		if ( ! blockNode ) {
-			return;
+			return null;
 		}
 
-		this.previousOffset = blockNode.getBoundingClientRect().top;
+		return blockNode.getBoundingClientRect().top;
 	}
 
 	/**
 	 * After a block reordering, restores the previous viewport top offset.
+	 *
+	 * @param {number} offset The scroll offset.
 	 */
-	restorePreviousOffset() {
+	restorePreviousOffset( offset ) {
 		const { selectionStart } = this.props;
 		const blockNode = getBlockDOMNode( selectionStart );
 		if ( blockNode ) {
 			const scrollContainer = getScrollContainer( blockNode );
 			if ( scrollContainer ) {
 				scrollContainer.scrollTop = scrollContainer.scrollTop +
-					blockNode.getBoundingClientRect().top -
-					this.previousOffset;
+					blockNode.getBoundingClientRect().top - offset;
 			}
 		}
-
-		delete this.previousOffset;
 	}
 
 	render() {
diff --git a/editor/components/rich-text/README.md b/editor/components/rich-text/README.md
index 302365b026cdf..306bb28cd7b85 100644
--- a/editor/components/rich-text/README.md
+++ b/editor/components/rich-text/README.md
@@ -1,12 +1,6 @@
 # `RichText`
 
-Render a rich
-[`contenteditable` input](https://developer.mozilla.org/en-US/docs/Web/Guide/HTML/Editable_content),
-providing users the option to add emphasis to content or links to content. It
-behaves similarly to a
-[controlled component](https://facebook.github.io/react/docs/forms.html#controlled-components),
-except that `onChange` is triggered less frequently than would be expected from
-a traditional `input` field, usually when the user exits the field.
+Render a rich [`contenteditable` input](https://developer.mozilla.org/en-US/docs/Web/Guide/HTML/Editable_content), providing users the option to add emphasis to content or links to content. It behaves similarly to a [controlled component](https://facebook.github.io/react/docs/forms.html#controlled-components), except that `onChange` is triggered less frequently than would be expected from a traditional `input` field, usually when the user exits the field.
 
 ## Properties
 
@@ -140,4 +134,4 @@ registerBlockType( /* ... */, {
 	}
 } );
 ```
-{% end %}
\ No newline at end of file
+{% end %}
diff --git a/editor/components/rich-text/format-toolbar/index.js b/editor/components/rich-text/format-toolbar/index.js
index 23c11e6e60b11..c56f24e8dc518 100644
--- a/editor/components/rich-text/format-toolbar/index.js
+++ b/editor/components/rich-text/format-toolbar/index.js
@@ -56,14 +56,26 @@ const DEFAULT_CONTROLS = [ 'bold', 'italic', 'strikethrough', 'link' ];
 // Stop the key event from propagating up to maybeStartTyping in BlockListBlock
 const stopKeyPropagation = ( event ) => event.stopPropagation();
 
+/**
+ * Returns the Format Toolbar state given a set of props.
+ *
+ * @param {Object} props Component props.
+ *
+ * @return {Object} State object.
+ */
+function computeDerivedState( props ) {
+	return {
+		selectedNodeId: props.selectedNodeId,
+		settingsVisible: false,
+		opensInNewWindow: !! props.formats.link && !! props.formats.link.target,
+		linkValue: '',
+	};
+}
+
 class FormatToolbar extends Component {
 	constructor() {
 		super( ...arguments );
-		this.state = {
-			settingsVisible: false,
-			opensInNewWindow: false,
-			linkValue: '',
-		};
+		this.state = {};
 
 		this.addLink = this.addLink.bind( this );
 		this.editLink = this.editLink.bind( this );
@@ -93,14 +105,12 @@ class FormatToolbar extends Component {
 		}
 	}
 
-	componentWillReceiveProps( nextProps ) {
-		if ( this.props.selectedNodeId !== nextProps.selectedNodeId ) {
-			this.setState( {
-				settingsVisible: false,
-				opensInNewWindow: !! nextProps.formats.link && !! nextProps.formats.link.target,
-				linkValue: '',
-			} );
+	static getDerivedStateFromProps( props, state ) {
+		if ( state.selectedNodeId !== props.selectedNodeId ) {
+			return computeDerivedState( props );
 		}
+
+		return null;
 	}
 
 	onChangeLinkValue( value ) {
diff --git a/editor/components/rich-text/index.js b/editor/components/rich-text/index.js
index 5f212579d1908..9f7a6d1afd7d0 100644
--- a/editor/components/rich-text/index.js
+++ b/editor/components/rich-text/index.js
@@ -742,11 +742,9 @@ export class RichText extends Component {
 		) {
 			this.updateContent();
 		}
-	}
 
-	componentWillReceiveProps( nextProps ) {
 		if ( 'development' === process.env.NODE_ENV ) {
-			if ( ! isEqual( this.props.formatters, nextProps.formatters ) ) {
+			if ( ! isEqual( this.props.formatters, prevProps.formatters ) ) {
 				// eslint-disable-next-line no-console
 				console.error( 'Formatters passed via `formatters` prop will only be registered once. Formatters can be enabled/disabled via the `formattingControls` prop.' );
 			}
@@ -854,7 +852,7 @@ export class RichText extends Component {
 			format,
 		} = this.props;
 
-		const ariaProps = { ...pickAriaProps( this.props ), 'aria-multiline': !! MultilineTag };
+		const ariaProps = pickAriaProps( this.props );
 
 		// Generating a key that includes `tagName` ensures that if the tag
 		// changes, we unmount and destroy the previous TinyMCE element, then
diff --git a/editor/components/rich-text/tinymce.js b/editor/components/rich-text/tinymce.js
index 3d02af7565d58..2b92d54a25720 100644
--- a/editor/components/rich-text/tinymce.js
+++ b/editor/components/rich-text/tinymce.js
@@ -116,13 +116,6 @@ export default class TinyMCE extends Component {
 		return false;
 	}
 
-	configureIsPlaceholderVisible( isPlaceholderVisible ) {
-		const isPlaceholderVisibleString = String( !! isPlaceholderVisible );
-		if ( this.editorNode.getAttribute( IS_PLACEHOLDER_VISIBLE_ATTR_NAME ) !== isPlaceholderVisibleString ) {
-			this.editorNode.setAttribute( IS_PLACEHOLDER_VISIBLE_ATTR_NAME, isPlaceholderVisibleString );
-		}
-	}
-
 	componentWillReceiveProps( nextProps ) {
 		this.configureIsPlaceholderVisible( nextProps.isPlaceholderVisible );
 
@@ -155,6 +148,13 @@ export default class TinyMCE extends Component {
 		delete this.editor;
 	}
 
+	configureIsPlaceholderVisible( isPlaceholderVisible ) {
+		const isPlaceholderVisibleString = String( !! isPlaceholderVisible );
+		if ( this.editorNode.getAttribute( IS_PLACEHOLDER_VISIBLE_ATTR_NAME ) !== isPlaceholderVisibleString ) {
+			this.editorNode.setAttribute( IS_PLACEHOLDER_VISIBLE_ATTR_NAME, isPlaceholderVisibleString );
+		}
+	}
+
 	initialize() {
 		const settings = this.props.getSettings( {
 			theme: false,
@@ -202,8 +202,15 @@ export default class TinyMCE extends Component {
 	render() {
 		const { tagName = 'div', style, defaultValue, className, isPlaceholderVisible, format } = this.props;
 		const ariaProps = pickAriaProps( this.props );
-		if ( [ 'ul', 'ol', 'table' ].indexOf( tagName ) === -1 ) {
+
+		/*
+		 * The role=textbox and aria-multiline=true must always be used together
+		 * as TinyMCE always behaves like a sort of textarea where text wraps in
+		 * multiple lines. Only the table block editable element is excluded.
+		 */
+		if ( tagName !== 'table' ) {
 			ariaProps.role = 'textbox';
+			ariaProps[ 'aria-multiline' ] = true;
 		}
 
 		// If a default value is provided, render it into the DOM even before
diff --git a/editor/deprecated.js b/editor/deprecated.js
deleted file mode 100644
index 0135f7c71a66c..0000000000000
--- a/editor/deprecated.js
+++ /dev/null
@@ -1,115 +0,0 @@
-/**
- * External dependencies
- */
-import { forEach } from 'lodash';
-
-/**
- * WordPress dependencies
- */
-import { Component } from '@wordpress/element';
-import deprecated from '@wordpress/deprecated';
-import { withSelect } from '@wordpress/data';
-
-import {
-	Autocomplete,
-	AlignmentToolbar,
-	BlockAlignmentToolbar,
-	BlockControls,
-	BlockEdit,
-	BlockFormatControls,
-	BlockIcon,
-	ColorPalette,
-	ContrastChecker,
-	ImagePlaceholder,
-	InnerBlocks,
-	InspectorAdvancedControls,
-	InspectorControls,
-	PlainText,
-	RichText,
-	RichTextProvider,
-	MediaUpload,
-	UrlInput,
-	UrlInputButton,
-	withColorContext,
-	getColorClass,
-	getColorName,
-	withColors,
-} from './components';
-import { editorMediaUpload } from './utils';
-
-const componentsToDepreacate = {
-	Autocomplete,
-	AlignmentToolbar,
-	BlockAlignmentToolbar,
-	BlockControls,
-	BlockEdit,
-	BlockFormatControls,
-	BlockIcon,
-	ColorPalette,
-	ContrastChecker,
-	ImagePlaceholder,
-	InnerBlocks,
-	InspectorAdvancedControls,
-	InspectorControls,
-	PlainText,
-	RichText,
-	RichTextProvider,
-	MediaUpload,
-	UrlInput,
-	UrlInputButton,
-};
-
-const functionsToDeprecate = {
-	withColorContext,
-	getColorClass,
-	getColorName,
-	withColors,
-	editorMediaUpload,
-};
-
-forEach( componentsToDepreacate, ( WrappedComponent, key ) => {
-	wp.blocks[ key ] = class extends Component {
-		constructor() {
-			super( ...arguments );
-
-			deprecated( 'wp.blocks.' + key, {
-				version: '3.1',
-				alternative: 'wp.editor.' + key,
-				plugin: 'Gutenberg',
-			} );
-		}
-
-		render() {
-			return <WrappedComponent { ...this.props } />;
-		}
-	};
-} );
-
-forEach( functionsToDeprecate, ( wrappedFunction, key ) => {
-	wp.blocks[ key ] = ( ...args ) => {
-		deprecated( 'wp.blocks.' + key, {
-			version: '3.1',
-			alternative: 'wp.editor.' + key,
-			plugin: 'Gutenberg',
-		} );
-		return wrappedFunction( ...args );
-	};
-} );
-
-wp.blocks.withEditorSettings = ( mapSettingsToProps ) => ( WrappedComponent ) => {
-	const applyWithSelect = withSelect( ( select, ownProps ) => {
-		const settings = select( 'core/editor' ).getEditorSettings();
-		if ( ! mapSettingsToProps ) {
-			return { settings };
-		}
-		return mapSettingsToProps( settings, ownProps );
-	} );
-
-	deprecated( 'wp.blocks.withEditorSettings', {
-		version: '3.1',
-		alternative: 'the data module to access the editor settings `wp.data.select( "core/editor" ).getEditorSettings()`',
-		plugin: 'Gutenberg',
-	} );
-
-	return applyWithSelect( WrappedComponent );
-};
diff --git a/editor/hooks/align.js b/editor/hooks/align.js
index 4341d5a9299ea..a516fe54f652e 100644
--- a/editor/hooks/align.js
+++ b/editor/hooks/align.js
@@ -97,7 +97,7 @@ export const withToolbarControls = createHigherOrderComponent( ( BlockEdit ) =>
  * @param  {Function} BlockListBlock Original component
  * @return {Function}                Wrapped component
  */
-export const withAlign = createHigherOrderComponent( ( BlockListBlock ) => {
+export const withDataAlign = createHigherOrderComponent( ( BlockListBlock ) => {
 	return ( props ) => {
 		const { align } = props.block.attributes;
 		const validAlignments = getBlockValidAlignments( props.block.name );
@@ -109,7 +109,7 @@ export const withAlign = createHigherOrderComponent( ( BlockListBlock ) => {
 
 		return <BlockListBlock { ...props } wrapperProps={ wrapperProps } />;
 	};
-}, 'withAlign' );
+}, 'withDataAlign' );
 
 /**
  * Override props assigned to save component to inject alignment class name if
@@ -131,7 +131,7 @@ export function addAssignedAlign( props, blockType, attributes ) {
 }
 
 addFilter( 'blocks.registerBlockType', 'core/align/addAttribute', addAttribute );
-addFilter( 'editor.BlockListBlock', 'core/align/withAlign', withAlign );
-addFilter( 'blocks.BlockEdit', 'core/align/withToolbarControls', withToolbarControls );
+addFilter( 'editor.BlockListBlock', 'core/editor/align/with-data-align', withDataAlign );
+addFilter( 'editor.BlockEdit', 'core/editor/align/with-toolbar-controls', withToolbarControls );
 addFilter( 'blocks.getSaveContent.extraProps', 'core/align/addAssignedAlign', addAssignedAlign );
 
diff --git a/editor/hooks/anchor.js b/editor/hooks/anchor.js
index 2eb54e44aeb9d..67f0b4298838f 100644
--- a/editor/hooks/anchor.js
+++ b/editor/hooks/anchor.js
@@ -104,5 +104,5 @@ export function addSaveProps( extraProps, blockType, attributes ) {
 }
 
 addFilter( 'blocks.registerBlockType', 'core/anchor/attribute', addAttribute );
-addFilter( 'blocks.BlockEdit', 'core/anchor/inspector-control', withInspectorControl );
+addFilter( 'editor.BlockEdit', 'core/editor/anchor/with-inspector-control', withInspectorControl );
 addFilter( 'blocks.getSaveContent.extraProps', 'core/anchor/save-props', addSaveProps );
diff --git a/editor/hooks/custom-class-name.js b/editor/hooks/custom-class-name.js
index 86bf4e45a3918..9d94b40e65398 100644
--- a/editor/hooks/custom-class-name.js
+++ b/editor/hooks/custom-class-name.js
@@ -94,5 +94,5 @@ export function addSaveProps( extraProps, blockType, attributes ) {
 }
 
 addFilter( 'blocks.registerBlockType', 'core/custom-class-name/attribute', addAttribute );
-addFilter( 'blocks.BlockEdit', 'core/custom-class-name/inspector-control', withInspectorControl );
+addFilter( 'editor.BlockEdit', 'core/editor/custom-class-name/with-inspector-control', withInspectorControl );
 addFilter( 'blocks.getSaveContent.extraProps', 'core/custom-class-name/save-props', addSaveProps );
diff --git a/editor/hooks/default-autocompleters.js b/editor/hooks/default-autocompleters.js
index 5b4be9ca031d8..7042b5b7b40a7 100644
--- a/editor/hooks/default-autocompleters.js
+++ b/editor/hooks/default-autocompleters.js
@@ -40,7 +40,7 @@ function setDefaultCompleters( completers, blockName ) {
 }
 
 addFilter(
-	'blocks.Autocomplete.completers',
-	'blocks/autocompleters/set-default-completers',
+	'editor.Autocomplete.completers',
+	'editor/autocompleters/set-default-completers',
 	setDefaultCompleters
 );
diff --git a/editor/hooks/test/align.js b/editor/hooks/test/align.js
index ea4c491d98c1d..9c578a45742b2 100644
--- a/editor/hooks/test/align.js
+++ b/editor/hooks/test/align.js
@@ -20,7 +20,7 @@ import {
 import {
 	getBlockValidAlignments,
 	withToolbarControls,
-	withAlign,
+	withDataAlign,
 	addAssignedAlign,
 } from '../align';
 
@@ -150,7 +150,7 @@ describe( 'align', () => {
 		} );
 	} );
 
-	describe( 'withAlign', () => {
+	describe( 'withDataAlign', () => {
 		it( 'should render with wrapper props', () => {
 			registerBlockType( 'core/foo', {
 				...blockSettings,
@@ -160,7 +160,7 @@ describe( 'align', () => {
 				},
 			} );
 
-			const EnhancedComponent = withAlign( ( { wrapperProps } ) => (
+			const EnhancedComponent = withDataAlign( ( { wrapperProps } ) => (
 				<div { ...wrapperProps } />
 			) );
 
@@ -189,7 +189,7 @@ describe( 'align', () => {
 				},
 			} );
 
-			const EnhancedComponent = withAlign( ( { wrapperProps } ) => (
+			const EnhancedComponent = withDataAlign( ( { wrapperProps } ) => (
 				<div { ...wrapperProps } />
 			) );
 
diff --git a/editor/hooks/test/default-autocompleters.js b/editor/hooks/test/default-autocompleters.js
index 8afe8c43a6c4b..c44f723a9efd5 100644
--- a/editor/hooks/test/default-autocompleters.js
+++ b/editor/hooks/test/default-autocompleters.js
@@ -14,7 +14,7 @@ describe( 'default-autocompleters', () => {
 	const defaultAutocompleters = [ userAutocompleter ];
 
 	it( 'provides default completers if none are provided', () => {
-		const result = applyFilters( 'blocks.Autocomplete.completers', null, BLOCK_NAME );
+		const result = applyFilters( 'editor.Autocomplete.completers', null, BLOCK_NAME );
 		/*
 		 * Assert structural equality because defaults are provided as a
 		 * list of cloned completers (and not referentially equal).
@@ -24,20 +24,20 @@ describe( 'default-autocompleters', () => {
 
 	it( 'does not provide default completers for empty completer list', () => {
 		const emptyList = [];
-		const result = applyFilters( 'blocks.Autocomplete.completers', emptyList, BLOCK_NAME );
+		const result = applyFilters( 'editor.Autocomplete.completers', emptyList, BLOCK_NAME );
 		// Assert referential equality because the list should be unchanged.
 		expect( result ).toBe( emptyList );
 	} );
 
 	it( 'does not provide default completers for a populated completer list', () => {
 		const populatedList = [ {}, {} ];
-		const result = applyFilters( 'blocks.Autocomplete.completers', populatedList, BLOCK_NAME );
+		const result = applyFilters( 'editor.Autocomplete.completers', populatedList, BLOCK_NAME );
 		// Assert referential equality because the list should be unchanged.
 		expect( result ).toBe( populatedList );
 	} );
 
 	it( 'provides copies of defaults so they may be directly modified', () => {
-		const result = applyFilters( 'blocks.Autocomplete.completers', null, BLOCK_NAME );
+		const result = applyFilters( 'editor.Autocomplete.completers', null, BLOCK_NAME );
 		result.forEach( ( completer, i ) => {
 			const defaultCompleter = defaultAutocompleters[ i ];
 			expect( completer ).not.toBe( defaultCompleter );
diff --git a/editor/index.js b/editor/index.js
index 7a1538bcc1c7b..170617fc80f23 100644
--- a/editor/index.js
+++ b/editor/index.js
@@ -1,4 +1,3 @@
-import './deprecated';
 import './store';
 import './hooks';
 
diff --git a/editor/store/actions.js b/editor/store/actions.js
index 65619fb8b54ad..278a76e1c0e5f 100644
--- a/editor/store/actions.js
+++ b/editor/store/actions.js
@@ -59,6 +59,21 @@ export function resetAutosave( post ) {
 	};
 }
 
+/**
+ * Returns an action object used in signalling that a patch of updates for the
+ * latest version of the post have been received.
+ *
+ * @param {Object} edits Updated post fields.
+ *
+ * @return {Object} Action object.
+ */
+export function updatePost( edits ) {
+	return {
+		type: 'UPDATE_POST',
+		edits,
+	};
+}
+
 /**
  * Returns an action object used to setup the editor state when first opening an editor.
  *
@@ -376,7 +391,7 @@ export function editPost( edits ) {
  *
  * @return {Object} Action object.
  */
-export function savePost( options ) {
+export function savePost( options = {} ) {
 	return {
 		type: 'REQUEST_POST_UPDATE',
 		options,
diff --git a/editor/store/effects.js b/editor/store/effects.js
index 917d76b89b9e4..75da4df7821d2 100644
--- a/editor/store/effects.js
+++ b/editor/store/effects.js
@@ -25,11 +25,11 @@ import apiRequest from '@wordpress/api-request';
 /**
  * Internal dependencies
  */
-import { getWPAdminURL } from '../utils/url';
 import {
 	setupEditorState,
 	resetAutosave,
 	resetPost,
+	updatePost,
 	receiveBlocks,
 	receiveSharedBlocks,
 	replaceBlock,
@@ -65,6 +65,7 @@ import {
 	getTemplate,
 	getTemplateLock,
 	getAutosave,
+	isEditedPostNew,
 	POST_UPDATE_TRANSACTION_ID,
 } from './selectors';
 
@@ -97,7 +98,8 @@ export default {
 	REQUEST_POST_UPDATE( action, store ) {
 		const { dispatch, getState } = store;
 		const state = getState();
-		const isAutosave = action.options && action.options.autosave;
+		const post = getCurrentPost( state );
+		const isAutosave = !! action.options.autosave;
 
 		// Prevent save if not saveable.
 		const isSaveable = isAutosave ? isEditedPostAutosaveable : isEditedPostSaveable;
@@ -105,8 +107,26 @@ export default {
 			return;
 		}
 
-		const post = getCurrentPost( state );
-		const edits = getPostEdits( state );
+		let edits = getPostEdits( state );
+		if ( isAutosave ) {
+			edits = pick( edits, [ 'title', 'content', 'excerpt' ] );
+		}
+
+		// New posts (with auto-draft status) must be explicitly assigned draft
+		// status if there is not already a status assigned in edits (publish).
+		// Otherwise, they are wrongly left as auto-draft. Status is not always
+		// respected for autosaves, so it cannot simply be included in the pick
+		// above. This behavior relies on an assumption that an auto-draft post
+		// would never be saved by anyone other than the owner of the post, per
+		// logic within autosaves REST controller to save status field only for
+		// draft/auto-draft by current user.
+		//
+		// See: https://core.trac.wordpress.org/ticket/43316#comment:88
+		// See: https://core.trac.wordpress.org/ticket/43316#comment:89
+		if ( isEditedPostNew( state ) ) {
+			edits = { status: 'draft', ...edits };
+		}
+
 		let toSend = {
 			...edits,
 			content: getEditedPostContent( state ),
@@ -120,6 +140,14 @@ export default {
 			isAutosave,
 		} );
 
+		// Optimistically apply updates under the assumption that the post
+		// will be updated. See below logic in success resolution for revert
+		// if the autosave is applied as a revision.
+		dispatch( {
+			...updatePost( toSend ),
+			optimist: { id: POST_UPDATE_TRANSACTION_ID },
+		} );
+
 		let request;
 		if ( isAutosave ) {
 			// Ensure autosaves contain all expected fields, using autosave or
@@ -137,12 +165,6 @@ export default {
 				data: toSend,
 			} );
 		} else {
-			dispatch( {
-				type: 'UPDATE_POST',
-				edits: toSend,
-				optimist: { id: POST_UPDATE_TRANSACTION_ID },
-			} );
-
 			dispatch( removeNotice( SAVE_POST_NOTICE_ID ) );
 			dispatch( removeNotice( AUTOSAVE_POST_NOTICE_ID ) );
 
@@ -158,11 +180,23 @@ export default {
 				const reset = isAutosave ? resetAutosave : resetPost;
 				dispatch( reset( newPost ) );
 
+				// An autosave may be processed by the server as a regular save
+				// when its update is requested by the author and the post was
+				// draft or auto-draft.
+				const isRevision = newPost.id !== post.id;
+
 				dispatch( {
 					type: 'REQUEST_POST_UPDATE_SUCCESS',
 					previousPost: post,
 					post: newPost,
-					optimist: { type: COMMIT, id: POST_UPDATE_TRANSACTION_ID },
+					optimist: {
+						// Note: REVERT is not a failure case here. Rather, it
+						// is simply reversing the assumption that the updates
+						// were applied to the post proper, such that the post
+						// treated as having unsaved changes.
+						type: isRevision ? REVERT : COMMIT,
+						id: POST_UPDATE_TRANSACTION_ID,
+					},
 					isAutosave,
 				} );
 			},
@@ -184,7 +218,16 @@ export default {
 	},
 	REQUEST_POST_UPDATE_SUCCESS( action, store ) {
 		const { previousPost, post, isAutosave } = action;
-		const { dispatch } = store;
+		const { dispatch, getState } = store;
+
+		// TEMPORARY: If edits remain after a save completes, the user must be
+		// prompted about unsaved changes. This should be refactored as part of
+		// the `isEditedPostDirty` selector instead.
+		//
+		// See: https://github.com/WordPress/gutenberg/issues/7409
+		if ( Object.keys( getPostEdits( getState() ) ).length ) {
+			dispatch( { type: 'DIRTY_ARTIFICIALLY' } );
+		}
 
 		// Autosaves are neither shown a notice nor redirected.
 		if ( isAutosave ) {
@@ -230,7 +273,14 @@ export default {
 		}
 	},
 	REQUEST_POST_UPDATE_FAILURE( action, store ) {
-		const { post, edits } = action;
+		const { post, edits, error } = action;
+
+		if ( error && 'rest_autosave_no_changes' === error.code ) {
+			// Autosave requested a new autosave, but there were no changes. This shouldn't
+			// result in an error notice for the user.
+			return;
+		}
+
 		const { dispatch } = store;
 
 		const publishStatus = [ 'publish', 'private', 'future' ];
@@ -254,10 +304,11 @@ export default {
 		dispatch( removeNotice( TRASH_POST_NOTICE_ID ) );
 		apiRequest( { path: `/wp/v2/${ basePath }/${ postId }`, method: 'DELETE' } ).then(
 			() => {
-				dispatch( {
-					...action,
-					type: 'TRASH_POST_SUCCESS',
-				} );
+				const post = getCurrentPost( getState() );
+
+				// TODO: This should be an updatePost action (updating subsets of post properties),
+				// But right now editPost is tied with change detection.
+				dispatch( resetPost( { ...post, status: 'trash' } ) );
 			},
 			( err ) => {
 				dispatch( {
@@ -271,15 +322,6 @@ export default {
 			}
 		);
 	},
-	TRASH_POST_SUCCESS( action ) {
-		const { postId, postType } = action;
-
-		window.location.href = getWPAdminURL( 'edit.php', {
-			trashed: 1,
-			post_type: postType,
-			ids: postId,
-		} );
-	},
 	TRASH_POST_FAILURE( action, store ) {
 		const message = action.error.message && action.error.code !== 'unknown_error' ? action.error.message : __( 'Trashing failed' );
 		store.dispatch( createErrorNotice( message, { id: TRASH_POST_NOTICE_ID } ) );
@@ -377,7 +419,6 @@ export default {
 		const edits = {};
 		if ( post.status === 'auto-draft' ) {
 			edits.title = post.title.raw;
-			edits.status = 'draft';
 		}
 
 		// Check the auto-save status
diff --git a/editor/store/reducer.js b/editor/store/reducer.js
index ec3558e5501c7..fdfdfa2476ed1 100644
--- a/editor/store/reducer.js
+++ b/editor/store/reducer.js
@@ -217,15 +217,15 @@ export const editor = flow( [
 	// Track undo history, starting at editor initialization.
 	withHistory( {
 		resetTypes: [ 'SETUP_EDITOR_STATE' ],
-		ignoreTypes: [ 'RECEIVE_BLOCKS' ],
+		ignoreTypes: [ 'RECEIVE_BLOCKS', 'RESET_POST', 'UPDATE_POST' ],
 		shouldOverwriteState,
 	} ),
 
 	// Track whether changes exist, resetting at each post save. Relies on
 	// editor initialization firing post reset as an effect.
 	withChangeDetection( {
-		resetTypes: [ 'SETUP_EDITOR_STATE', 'UPDATE_POST' ],
-		ignoreTypes: [ 'RECEIVE_BLOCKS', 'RESET_POST' ],
+		resetTypes: [ 'SETUP_EDITOR_STATE', 'REQUEST_POST_UPDATE_START' ],
+		ignoreTypes: [ 'RECEIVE_BLOCKS', 'RESET_POST', 'UPDATE_POST' ],
 	} ),
 ] )( {
 	edits( state = {}, action ) {
@@ -254,6 +254,9 @@ export const editor = flow( [
 
 				return state;
 
+			case 'DIRTY_ARTIFICIALLY':
+				return { ...state };
+
 			case 'UPDATE_POST':
 			case 'RESET_POST':
 				const getCanonicalValue = action.type === 'UPDATE_POST' ?
@@ -559,16 +562,6 @@ export function currentPost( state = {}, action ) {
 			}
 
 			return mapValues( post, getPostRawValue );
-
-		case 'RESET_AUTOSAVE':
-			// A post is no longer auto-draft (now draft) when autosave occurs.
-			if ( state.status === 'auto-draft' ) {
-				return {
-					...state,
-					status: 'draft',
-				};
-			}
-			break;
 	}
 
 	return state;
@@ -1085,7 +1078,19 @@ export function autosave( state = null, action ) {
 				'content',
 			].map( ( field ) => getPostRawValue( post[ field ] ) );
 
-			return { title, excerpt, content };
+			return {
+				title,
+				excerpt,
+				content,
+				preview_link: post.preview_link,
+			};
+
+		case 'REQUEST_POST_UPDATE':
+			// Invalidate known preview link when autosave starts.
+			if ( state && action.options.autosave ) {
+				return omit( state, 'preview_link' );
+			}
+			break;
 	}
 
 	return state;
diff --git a/editor/store/selectors.js b/editor/store/selectors.js
index 41c52acfbf9cd..44b9ab41bc9ec 100644
--- a/editor/store/selectors.js
+++ b/editor/store/selectors.js
@@ -155,7 +155,7 @@ export function getCurrentPostId( state ) {
  * @return {number} Number of revisions.
  */
 export function getCurrentPostRevisionsCount( state ) {
-	return get( getCurrentPost( state ), [ 'revisions', 'count' ], 0 );
+	return get( getCurrentPost( state ), [ '_links', 'version-history', 0, 'count' ], 0 );
 }
 
 /**
@@ -167,7 +167,7 @@ export function getCurrentPostRevisionsCount( state ) {
  * @return {?number} ID of the last revision.
  */
 export function getCurrentPostLastRevisionId( state ) {
-	return get( getCurrentPost( state ), [ 'revisions', 'last_id' ], null );
+	return get( getCurrentPost( state ), [ '_links', 'predecessor-version', 0, 'id' ], null );
 }
 
 /**
@@ -179,7 +179,22 @@ export function getCurrentPostLastRevisionId( state ) {
  * @return {Object} Object of key value pairs comprising unsaved edits.
  */
 export function getPostEdits( state ) {
-	return get( state, [ 'editor', 'present', 'edits' ], {} );
+	return state.editor.present.edits;
+}
+
+/**
+ * Returns an attribute value of the saved post.
+ *
+ * @param {Object} state         Global application state.
+ * @param {string} attributeName Post attribute name.
+ *
+ * @return {*} Post attribute value.
+ */
+export function getCurrentPostAttribute( state, attributeName ) {
+	const post = getCurrentPost( state );
+	if ( post.hasOwnProperty( attributeName ) ) {
+		return post[ attributeName ];
+	}
 }
 
 /**
@@ -201,9 +216,31 @@ export function getEditedPostAttribute( state, attributeName ) {
 			return getEditedPostContent( state );
 	}
 
-	return edits[ attributeName ] === undefined ?
-		state.currentPost[ attributeName ] :
-		edits[ attributeName ];
+	if ( ! edits.hasOwnProperty( attributeName ) ) {
+		return getCurrentPostAttribute( state, attributeName );
+	}
+
+	return edits[ attributeName ];
+}
+
+/**
+ * Returns an attribute value of the current autosave revision for a post, or
+ * null if there is no autosave for the post.
+ *
+ * @param {Object} state         Global application state.
+ * @param {string} attributeName Autosave attribute name.
+ *
+ * @return {*} Autosave attribute value.
+ */
+export function getAutosaveAttribute( state, attributeName ) {
+	if ( ! hasAutosave( state ) ) {
+		return null;
+	}
+
+	const autosave = getAutosave( state );
+	if ( autosave.hasOwnProperty( attributeName ) ) {
+		return autosave[ attributeName ];
+	}
 }
 
 /**
@@ -407,35 +444,6 @@ export function getDocumentTitle( state ) {
 	return title;
 }
 
-/**
- * Returns the raw excerpt of the post being edited, preferring the unsaved
- * value if different than the saved post.
- *
- * @param {Object} state Global application state.
- *
- * @return {string} Raw post excerpt.
- */
-export function getEditedPostExcerpt( state ) {
-	deprecated( 'getEditedPostExcerpt', {
-		version: '3.1',
-		alternative: 'getEditedPostAttribute( state, \'excerpt\' )',
-		plugin: 'Gutenberg',
-	} );
-
-	return getEditedPostAttribute( state, 'excerpt' );
-}
-
-/**
- * Returns a URL to preview the post being edited.
- *
- * @param {Object} state Global application state.
- *
- * @return {string} Preview URL.
- */
-export function getEditedPostPreviewLink( state ) {
-	return getCurrentPost( state ).preview_link || null;
-}
-
 /**
  * Returns a new reference when the inner blocks of a given block UID change.
  * This is used exclusively as a memoized selector dependant, relying on this
diff --git a/editor/store/test/actions.js b/editor/store/test/actions.js
index 4729c88c28655..401250bfeff59 100644
--- a/editor/store/test/actions.js
+++ b/editor/store/test/actions.js
@@ -244,6 +244,14 @@ describe( 'actions', () => {
 		it( 'should return REQUEST_POST_UPDATE action', () => {
 			expect( savePost() ).toEqual( {
 				type: 'REQUEST_POST_UPDATE',
+				options: {},
+			} );
+		} );
+
+		it( 'should pass through options argument', () => {
+			expect( savePost( { autosave: true } ) ).toEqual( {
+				type: 'REQUEST_POST_UPDATE',
+				options: { autosave: true },
 			} );
 		} );
 	} );
diff --git a/editor/store/test/effects.js b/editor/store/test/effects.js
index 83347462e9076..8e135cb7c566b 100644
--- a/editor/store/test/effects.js
+++ b/editor/store/test/effects.js
@@ -34,6 +34,7 @@ import {
 	convertBlockToStatic,
 	convertBlockToShared,
 	setTemplateValidity,
+	editPost,
 } from '../actions';
 import effects, {
 	removeProvisionalBlock,
@@ -260,6 +261,16 @@ describe( 'effects', () => {
 	describe( '.REQUEST_POST_UPDATE_SUCCESS', () => {
 		const handler = effects.REQUEST_POST_UPDATE_SUCCESS;
 
+		function createGetState( hasLingeringEdits = false ) {
+			let state = reducer( undefined, {} );
+			if ( hasLingeringEdits ) {
+				state = reducer( state, editPost( { edited: true } ) );
+			}
+
+			const getState = () => state;
+			return getState;
+		}
+
 		const defaultPost = {
 			id: 1,
 			title: {
@@ -280,7 +291,7 @@ describe( 'effects', () => {
 
 		it( 'should dispatch notices when publishing or scheduling a post', () => {
 			const dispatch = jest.fn();
-			const store = { dispatch };
+			const store = { dispatch, getState: createGetState() };
 
 			const previousPost = getDraftPost();
 			const post = getPublishedPost();
@@ -302,7 +313,7 @@ describe( 'effects', () => {
 
 		it( 'should dispatch notices when reverting a published post to a draft', () => {
 			const dispatch = jest.fn();
-			const store = { dispatch };
+			const store = { dispatch, getState: createGetState() };
 
 			const previousPost = getPublishedPost();
 			const post = getDraftPost();
@@ -328,7 +339,7 @@ describe( 'effects', () => {
 
 		it( 'should dispatch notices when just updating a published post again', () => {
 			const dispatch = jest.fn();
-			const store = { dispatch };
+			const store = { dispatch, getState: createGetState() };
 
 			const previousPost = getPublishedPost();
 			const post = getPublishedPost();
@@ -350,7 +361,7 @@ describe( 'effects', () => {
 
 		it( 'should do nothing if the updated post was autosaved', () => {
 			const dispatch = jest.fn();
-			const store = { dispatch };
+			const store = { dispatch, getState: createGetState() };
 
 			const previousPost = getPublishedPost();
 			const post = { ...getPublishedPost(), id: defaultPost.id + 1 };
@@ -359,6 +370,19 @@ describe( 'effects', () => {
 
 			expect( dispatch ).toHaveBeenCalledTimes( 0 );
 		} );
+
+		it( 'should dispatch dirtying action if edits linger after autosave', () => {
+			const dispatch = jest.fn();
+			const store = { dispatch, getState: createGetState( true ) };
+
+			const previousPost = getPublishedPost();
+			const post = { ...getPublishedPost(), id: defaultPost.id + 1 };
+
+			handler( { post, previousPost, isAutosave: true }, store );
+
+			expect( dispatch ).toHaveBeenCalledTimes( 1 );
+			expect( dispatch ).toHaveBeenCalledWith( { type: 'DIRTY_ARTIFICIALLY' } );
+		} );
 	} );
 
 	describe( '.REQUEST_POST_UPDATE_FAILURE', () => {
@@ -389,6 +413,35 @@ describe( 'effects', () => {
 			expect( dispatch ).toHaveBeenCalledWith( createErrorNotice( 'Publishing failed', { id: 'SAVE_POST_NOTICE_ID' } ) );
 		} );
 
+		it( 'should not dispatch a notice when there were no changes for autosave to save.', () => {
+			const handler = effects.REQUEST_POST_UPDATE_FAILURE;
+			const dispatch = jest.fn();
+			const store = { getState: () => {}, dispatch };
+
+			const action = {
+				post: {
+					id: 1,
+					title: {
+						raw: 'A History of Pork',
+					},
+					content: {
+						raw: '',
+					},
+					status: 'draft',
+				},
+				edits: {
+					status: 'publish',
+				},
+				error: {
+					code: 'rest_autosave_no_changes',
+				},
+			};
+
+			handler( action, store );
+
+			expect( dispatch ).toHaveBeenCalledTimes( 0 );
+		} );
+
 		it( 'should dispatch a notice on failure when trying to update a draft.', () => {
 			const handler = effects.REQUEST_POST_UPDATE_FAILURE;
 			const dispatch = jest.fn();
@@ -502,7 +555,7 @@ describe( 'effects', () => {
 
 			expect( result ).toEqual( [
 				setTemplateValidity( true ),
-				setupEditorState( post, [], { title: 'A History of Pork', status: 'draft' } ),
+				setupEditorState( post, [], { title: 'A History of Pork' } ),
 			] );
 		} );
 	} );
diff --git a/editor/store/test/reducer.js b/editor/store/test/reducer.js
index e4ffbc89112e5..b1afa1c7e6e52 100644
--- a/editor/store/test/reducer.js
+++ b/editor/store/test/reducer.js
@@ -1273,24 +1273,6 @@ describe( 'state', () => {
 				status: 'publish',
 			} );
 		} );
-
-		it( 'should set status to draft if autosave reset while auto-draft', () => {
-			const original = deepFreeze( { title: '', status: 'auto-draft' } );
-
-			const state = currentPost( original, {
-				type: 'RESET_AUTOSAVE',
-				edits: {
-					title: 'Hello world',
-					content: '',
-					excerpt: '',
-				},
-			} );
-
-			expect( state ).toEqual( {
-				title: '',
-				status: 'draft',
-			} );
-		} );
 	} );
 
 	describe( 'isInsertionPointVisible', () => {
@@ -2298,6 +2280,7 @@ describe( 'state', () => {
 						raw: 'The Excerpt',
 					},
 					status: 'draft',
+					preview_link: 'https://wordpress.org/?p=1&preview=true',
 				},
 			} );
 
@@ -2305,6 +2288,7 @@ describe( 'state', () => {
 				title: 'The Title',
 				content: 'The Content',
 				excerpt: 'The Excerpt',
+				preview_link: 'https://wordpress.org/?p=1&preview=true',
 			} );
 		} );
 	} );
diff --git a/editor/store/test/selectors.js b/editor/store/test/selectors.js
index 4fba033320937..c1c665fa8d85d 100644
--- a/editor/store/test/selectors.js
+++ b/editor/store/test/selectors.js
@@ -28,7 +28,6 @@ const {
 	getCurrentPostType,
 	getPostEdits,
 	getDocumentTitle,
-	getEditedPostExcerpt,
 	getEditedPostVisibility,
 	isCurrentPostPending,
 	isCurrentPostPublished,
@@ -40,7 +39,6 @@ const {
 	hasAutosave,
 	isEditedPostEmpty,
 	isEditedPostBeingScheduled,
-	getEditedPostPreviewLink,
 	getBlockDependantsCacheBust,
 	getBlockName,
 	getBlock,
@@ -50,7 +48,9 @@ const {
 	getSelectedBlock,
 	getSelectedBlockUID,
 	getBlockRootUID,
+	getCurrentPostAttribute,
 	getEditedPostAttribute,
+	getAutosaveAttribute,
 	getGlobalBlockCount,
 	getMultiSelectedBlockUids,
 	getMultiSelectedBlocks,
@@ -365,10 +365,43 @@ describe( 'selectors', () => {
 		} );
 	} );
 
+	describe( 'getCurrentPostAttribute', () => {
+		it( 'should return undefined for an attribute which does not exist', () => {
+			const state = {
+				currentPost: {},
+			};
+
+			expect( getCurrentPostAttribute( state, 'foo' ) ).toBeUndefined();
+		} );
+
+		it( 'should return undefined for object prototype member', () => {
+			const state = {
+				currentPost: {},
+			};
+
+			expect( getCurrentPostAttribute( state, 'valueOf' ) ).toBeUndefined();
+		} );
+
+		it( 'should return the value of an attribute', () => {
+			const state = {
+				currentPost: {
+					title: 'Hello World',
+				},
+			};
+
+			expect( getCurrentPostAttribute( state, 'title' ) ).toBe( 'Hello World' );
+		} );
+	} );
+
 	describe( 'getEditedPostAttribute', () => {
 		it( 'should return the current post\'s slug if no edits have been made', () => {
 			const state = {
 				currentPost: { slug: 'post slug' },
+				editor: {
+					present: {
+						edits: {},
+					},
+				},
 			};
 
 			expect( getEditedPostAttribute( state, 'slug' ) ).toBe( 'post slug' );
@@ -418,6 +451,55 @@ describe( 'selectors', () => {
 
 			expect( getEditedPostAttribute( state, 'title' ) ).toBe( 'youcha' );
 		} );
+
+		it( 'should return undefined for object prototype member', () => {
+			const state = {
+				currentPost: {},
+				editor: {
+					present: {
+						edits: {},
+					},
+				},
+			};
+
+			expect( getEditedPostAttribute( state, 'valueOf' ) ).toBeUndefined();
+		} );
+	} );
+
+	describe( 'getAutosaveAttribute', () => {
+		it( 'returns null if there is no autosave', () => {
+			const state = {
+				autosave: null,
+			};
+
+			expect( getAutosaveAttribute( state, 'title' ) ).toBeNull();
+		} );
+
+		it( 'returns undefined for an attribute which is not set', () => {
+			const state = {
+				autosave: {},
+			};
+
+			expect( getAutosaveAttribute( state, 'foo' ) ).toBeUndefined();
+		} );
+
+		it( 'returns undefined for object prototype member', () => {
+			const state = {
+				autosave: {},
+			};
+
+			expect( getAutosaveAttribute( state, 'valueOf' ) ).toBeUndefined();
+		} );
+
+		it( 'returns the attribute value', () => {
+			const state = {
+				autosave: {
+					title: 'Hello World',
+				},
+			};
+
+			expect( getAutosaveAttribute( state, 'title' ) ).toBe( 'Hello World' );
+		} );
 	} );
 
 	describe( 'getCurrentPostLastRevisionId', () => {
@@ -432,8 +514,12 @@ describe( 'selectors', () => {
 		it( 'should return the last revision ID', () => {
 			const state = {
 				currentPost: {
-					revisions: {
-						last_id: 123,
+					_links: {
+						'predecessor-version': [
+							{
+								id: 123,
+							},
+						],
 					},
 				},
 			};
@@ -454,8 +540,12 @@ describe( 'selectors', () => {
 		it( 'should return the number of revisions', () => {
 			const state = {
 				currentPost: {
-					revisions: {
-						count: 5,
+					_links: {
+						'version-history': [
+							{
+								count: 5,
+							},
+						],
 					},
 				},
 			};
@@ -581,40 +671,6 @@ describe( 'selectors', () => {
 		} );
 	} );
 
-	describe( 'getEditedPostExcerpt', () => {
-		it( 'should return the post saved excerpt if the excerpt is not edited', () => {
-			const state = {
-				currentPost: {
-					excerpt: 'sassel',
-				},
-				editor: {
-					present: {
-						edits: { status: 'private' },
-					},
-				},
-			};
-
-			expect( getEditedPostExcerpt( state ) ).toBe( 'sassel' );
-			expect( console ).toHaveWarned();
-		} );
-
-		it( 'should return the edited excerpt', () => {
-			const state = {
-				currentPost: {
-					excerpt: 'sassel',
-				},
-				editor: {
-					present: {
-						edits: { excerpt: 'youcha' },
-					},
-				},
-			};
-
-			expect( getEditedPostExcerpt( state ) ).toBe( 'youcha' );
-			expect( console ).toHaveWarned();
-		} );
-	} );
-
 	describe( 'getEditedPostVisibility', () => {
 		it( 'should return public by default', () => {
 			const state = {
@@ -1257,26 +1313,6 @@ describe( 'selectors', () => {
 		} );
 	} );
 
-	describe( 'getEditedPostPreviewLink', () => {
-		it( 'should return null if the post has not link yet', () => {
-			const state = {
-				currentPost: {},
-			};
-
-			expect( getEditedPostPreviewLink( state ) ).toBeNull();
-		} );
-
-		it( 'should return the correct url when the post object has a preview_link', () => {
-			const state = {
-				currentPost: {
-					preview_link: 'https://andalouses.com/?p=1&preview=true',
-				},
-			};
-
-			expect( getEditedPostPreviewLink( state ) ).toBe( 'https://andalouses.com/?p=1&preview=true' );
-		} );
-	} );
-
 	describe( 'getBlockDependantsCacheBust', () => {
 		const rootBlock = { uid: 123, name: 'core/paragraph', attributes: {} };
 		const rootOrder = [ 123 ];
@@ -3583,6 +3619,11 @@ describe( 'selectors', () => {
 		it( 'should be false if there is no permalink', () => {
 			const state = {
 				currentPost: { permalink_template: '' },
+				editor: {
+					present: {
+						edits: {},
+					},
+				},
 			};
 
 			expect( isPermalinkEditable( state ) ).toBe( false );
@@ -3591,6 +3632,11 @@ describe( 'selectors', () => {
 		it( 'should be false if the permalink is not of an editable kind', () => {
 			const state = {
 				currentPost: { permalink_template: 'http://foo.test/bar/%baz%/' },
+				editor: {
+					present: {
+						edits: {},
+					},
+				},
 			};
 
 			expect( isPermalinkEditable( state ) ).toBe( false );
@@ -3599,6 +3645,11 @@ describe( 'selectors', () => {
 		it( 'should be true if the permalink has %postname%', () => {
 			const state = {
 				currentPost: { permalink_template: 'http://foo.test/bar/%postname%/' },
+				editor: {
+					present: {
+						edits: {},
+					},
+				},
 			};
 
 			expect( isPermalinkEditable( state ) ).toBe( true );
@@ -3607,6 +3658,11 @@ describe( 'selectors', () => {
 		it( 'should be true if the permalink has %pagename%', () => {
 			const state = {
 				currentPost: { permalink_template: 'http://foo.test/bar/%pagename%/' },
+				editor: {
+					present: {
+						edits: {},
+					},
+				},
 			};
 
 			expect( isPermalinkEditable( state ) ).toBe( true );
@@ -3618,6 +3674,11 @@ describe( 'selectors', () => {
 			const url = 'http://foo.test/?post=1';
 			const state = {
 				currentPost: { permalink_template: url },
+				editor: {
+					present: {
+						edits: {},
+					},
+				},
 			};
 
 			expect( getPermalink( state ) ).toBe( url );
@@ -3629,6 +3690,11 @@ describe( 'selectors', () => {
 					permalink_template: 'http://foo.test/bar/%postname%/',
 					slug: 'baz',
 				},
+				editor: {
+					present: {
+						edits: {},
+					},
+				},
 			};
 
 			expect( getPermalink( state ) ).toBe( 'http://foo.test/bar/baz/' );
@@ -3647,6 +3713,11 @@ describe( 'selectors', () => {
 					permalink_template: 'http://foo.test/bar/%postname%/',
 					slug: 'baz',
 				},
+				editor: {
+					present: {
+						edits: {},
+					},
+				},
 			};
 
 			expect( getPermalinkParts( state ) ).toEqual( parts );
@@ -3662,6 +3733,11 @@ describe( 'selectors', () => {
 					permalink_template: 'http://foo.test/?post=1',
 					slug: 'baz',
 				},
+				editor: {
+					present: {
+						edits: {},
+					},
+				},
 			};
 
 			expect( getPermalinkParts( state ) ).toEqual( parts );
diff --git a/editor/utils/block-list.js b/editor/utils/block-list.js
deleted file mode 100644
index 2bbfe34cdc326..0000000000000
--- a/editor/utils/block-list.js
+++ /dev/null
@@ -1,127 +0,0 @@
-/**
- * External dependencies
- */
-import { isEqual, noop, omit } from 'lodash';
-
-/**
- * WordPress dependencies
- */
-import { Component, compose } from '@wordpress/element';
-import {
-	synchronizeBlocksWithTemplate,
-} from '@wordpress/blocks';
-import { withSelect, withDispatch } from '@wordpress/data';
-
-/**
- * Internal dependencies
- */
-import BlockList from '../components/block-list';
-
-/**
- * An object of cached BlockList components
- *
- * @type {Object}
- */
-const INNER_BLOCK_LIST_CACHE = {};
-
-/**
- * Returns a BlockList component which is already pre-bound to render with a
- * given UID as its rootUID prop. It is necessary to cache these components
- * because otherwise the rendering of a nested BlockList will cause ancestor
- * blocks to re-mount, leading to an endless cycle of remounting inner blocks.
- *
- * @param {string}   uid                   Block UID to use as root UID of
- *                                         BlockList component.
- * @param {Function} renderBlockMenu       Render function for block menu of
- *                                         nested BlockList.
- *
- * @return {Component} Pre-bound BlockList component
- */
-export function createInnerBlockList( uid, renderBlockMenu = noop ) {
-	if ( ! INNER_BLOCK_LIST_CACHE[ uid ] ) {
-		const InnerBlockListComponent = class extends Component {
-			componentWillReceiveProps( nextProps ) {
-				this.updateNestedSettings( {
-					supportedBlocks: nextProps.allowedBlocks,
-				} );
-			}
-
-			componentWillUnmount() {
-				// If, after decrementing the tracking count, there are no
-				// remaining instances of the component, remove from cache.
-				if ( ! INNER_BLOCK_LIST_CACHE[ uid ][ 1 ]-- ) {
-					delete INNER_BLOCK_LIST_CACHE[ uid ];
-				}
-			}
-
-			componentDidMount() {
-				INNER_BLOCK_LIST_CACHE[ uid ][ 1 ]++;
-				this.updateNestedSettings( {
-					supportedBlocks: this.props.allowedBlocks,
-				} );
-				this.insertTemplateBlocks( this.props.template );
-			}
-
-			insertTemplateBlocks( template ) {
-				const { block, insertBlocks } = this.props;
-				if ( template && ! block.innerBlocks.length ) {
-					// synchronizeBlocksWithTemplate( [], template ) parses the template structure,
-					// and returns/creates the necessary blocks to represent it.
-					insertBlocks( synchronizeBlocksWithTemplate( [], template ) );
-				}
-			}
-
-			updateNestedSettings( newSettings ) {
-				if ( ! isEqual( this.props.blockListSettings, newSettings ) ) {
-					this.props.updateNestedSettings( newSettings );
-				}
-			}
-
-			render() {
-				return (
-					<BlockList
-						rootUID={ uid }
-						renderBlockMenu={ renderBlockMenu }
-						{ ...omit(
-							this.props, [
-								'allowedBlocks',
-								'block',
-								'blockListSettings',
-								'insertBlocks',
-								'template',
-								'updateNestedSettings',
-							]
-						) } />
-				);
-			}
-		};
-
-		const InnerBlockListComponentContainer = compose(
-			withSelect( ( select ) => {
-				const { getBlock, getBlockListSettings } = select( 'core/editor' );
-				return {
-					block: getBlock( uid ),
-					blockListSettings: getBlockListSettings( uid ),
-				};
-			} ),
-			withDispatch( ( dispatch ) => {
-				const { insertBlocks, updateBlockListSettings } = dispatch( 'core/editor' );
-				return {
-					insertBlocks( blocks ) {
-						dispatch( insertBlocks( blocks, undefined, uid ) );
-					},
-					updateNestedSettings( settings ) {
-						dispatch( updateBlockListSettings( uid, settings ) );
-					},
-				};
-			} ),
-		)( InnerBlockListComponent );
-
-		INNER_BLOCK_LIST_CACHE[ uid ] = [
-			InnerBlockListComponentContainer,
-			0, // A counter tracking active mounted instances:
-		];
-	}
-
-	return INNER_BLOCK_LIST_CACHE[ uid ][ 0 ];
-}
diff --git a/editor/utils/editor-media-upload/index.js b/editor/utils/editor-media-upload/index.js
index 2823592444a5c..d2ffbad98729f 100644
--- a/editor/utils/editor-media-upload/index.js
+++ b/editor/utils/editor-media-upload/index.js
@@ -8,7 +8,6 @@ import { noop } from 'lodash';
  */
 import { select } from '@wordpress/data';
 import { mediaUpload } from '@wordpress/utils';
-import { __, sprintf } from '@wordpress/i18n';
 
 /**
  * Upload a media file when the file upload button is activated.
@@ -31,22 +30,6 @@ export default function editorMediaUpload( {
 } ) {
 	const postId = select( 'core/editor' ).getCurrentPostId();
 
-	const errorHandler = ( { file, sizeAboveLimit, generalError } ) => {
-		let errorMsg;
-		if ( sizeAboveLimit ) {
-			errorMsg = sprintf(
-				__( '%s exceeds the maximum upload size for this site.' ),
-				file.name
-			);
-		} else if ( generalError ) {
-			errorMsg = sprintf(
-				__( 'Error while uploading file %s to the media library.' ),
-				file.name
-			);
-		}
-		onError( errorMsg );
-	};
-
 	mediaUpload( {
 		allowedType,
 		filesList,
@@ -55,6 +38,6 @@ export default function editorMediaUpload( {
 			post: postId,
 		},
 		maxUploadFileSize,
-		onError: errorHandler,
+		onError: ( { message } ) => onError( message ),
 	} );
 }
diff --git a/gutenberg.php b/gutenberg.php
index a3885aa32c7ee..8e48573b7a7a3 100644
--- a/gutenberg.php
+++ b/gutenberg.php
@@ -3,7 +3,7 @@
  * Plugin Name: Gutenberg
  * Plugin URI: https://github.com/WordPress/gutenberg
  * Description: Printing since 1440. This is the development plugin for the new block editor in core.
- * Version: 3.0.1
+ * Version: 3.1.0
  * Author: Gutenberg Team
  *
  * @package gutenberg
diff --git a/lib/class-wp-rest-autosaves-controller.php b/lib/class-wp-rest-autosaves-controller.php
index 4fcd571d15f14..6058ba5297112 100644
--- a/lib/class-wp-rest-autosaves-controller.php
+++ b/lib/class-wp-rest-autosaves-controller.php
@@ -265,7 +265,17 @@ public function get_items( $request ) {
 	 * @return array Item schema data.
 	 */
 	public function get_item_schema() {
-		return $this->revisions_controller->get_item_schema();
+		$schema = $this->revisions_controller->get_item_schema();
+
+		$schema['properties']['preview_link'] = array(
+			'description' => __( 'Preview link for the post.', 'gutenberg' ),
+			'type'        => 'string',
+			'format'      => 'uri',
+			'context'     => array( 'edit' ),
+			'readonly'    => true,
+		);
+
+		return $schema;
 	}
 
 	/**
@@ -309,7 +319,7 @@ public function create_post_autosave( $post_data ) {
 
 			if ( ! $autosave_is_different ) {
 				wp_delete_post_revision( $old_autosave->ID );
-				return new WP_Error( 'rest_autosave_no_changes', __( 'There is nothing to save. The autosave and the post content are the same.', 'gutenberg' ) );
+				return new WP_Error( 'rest_autosave_no_changes', __( 'There is nothing to save. The autosave and the post content are the same.', 'gutenberg' ), array( 'status' => 400 ) );
 			}
 
 			/**
@@ -339,6 +349,24 @@ public function prepare_item_for_response( $post, $request ) {
 
 		$response = $this->revisions_controller->prepare_item_for_response( $post, $request );
 
+		$schema = $this->get_item_schema();
+
+		if ( ! empty( $schema['properties']['preview_link'] ) ) {
+			$parent_id          = wp_is_post_autosave( $post );
+			$preview_post_id    = false === $parent_id ? $post->ID : $parent_id;
+			$preview_query_args = array();
+
+			if ( false !== $parent_id ) {
+				$preview_query_args['preview_id']    = $parent_id;
+				$preview_query_args['preview_nonce'] = wp_create_nonce( 'post_preview_' . $parent_id );
+			}
+
+			$response->data['preview_link'] = get_preview_post_link( $preview_post_id, $preview_query_args );
+		}
+
+		$context        = ! empty( $request['context'] ) ? $request['context'] : 'view';
+		$response->data = $this->filter_response_by_context( $response->data, $context );
+
 		/**
 		 * Filters a revision returned from the API.
 		 *
diff --git a/lib/client-assets.php b/lib/client-assets.php
index 2835cc187ece3..d89982e6f254f 100644
--- a/lib/client-assets.php
+++ b/lib/client-assets.php
@@ -185,7 +185,7 @@ function gutenberg_register_scripts_and_styles() {
 	wp_register_script(
 		'wp-utils',
 		gutenberg_url( 'build/utils/index.js' ),
-		array( 'lodash', 'wp-blob', 'wp-deprecated', 'wp-dom', 'wp-api-request' ),
+		array( 'lodash', 'wp-blob', 'wp-deprecated', 'wp-api-request', 'wp-i18n' ),
 		filemtime( gutenberg_dir_path() . 'build/utils/index.js' ),
 		true
 	);
@@ -505,7 +505,7 @@ function gutenberg_register_scripts_and_styles() {
 	wp_register_script(
 		'wp-plugins',
 		gutenberg_url( 'build/plugins/index.js' ),
-		array( 'wp-element', 'wp-components', 'wp-utils', 'wp-data' ),
+		array( 'lodash', 'wp-element', 'wp-hooks' ),
 		filemtime( gutenberg_dir_path() . 'build/plugins/index.js' )
 	);
 
@@ -592,11 +592,11 @@ function gutenberg_register_vendor_scripts() {
 
 	gutenberg_register_vendor_script(
 		'react',
-		'https://unpkg.com/react@16.3.2/umd/react' . $react_suffix . '.js'
+		'https://unpkg.com/react@16.4.1/umd/react' . $react_suffix . '.js'
 	);
 	gutenberg_register_vendor_script(
 		'react-dom',
-		'https://unpkg.com/react-dom@16.3.2/umd/react-dom' . $react_suffix . '.js',
+		'https://unpkg.com/react-dom@16.4.1/umd/react-dom' . $react_suffix . '.js',
 		array( 'react' )
 	);
 	$moment_script = SCRIPT_DEBUG ? 'moment.js' : 'min/moment.min.js';
@@ -1048,7 +1048,8 @@ function gutenberg_editor_scripts_and_styles( $hook ) {
 	}
 	// Initialize media settings.
 	wp_add_inline_script( 'wp-editor', 'window._wpMediaSettings = ' . wp_json_encode( array(
-		'maxUploadSize' => $max_upload_size,
+		'maxUploadSize'    => $max_upload_size,
+		'allowedMimeTypes' => get_allowed_mime_types(),
 	) ), 'before' );
 
 	// Prepare Jed locale data.
@@ -1188,19 +1189,3 @@ function gutenberg_editor_scripts_and_styles( $hook ) {
 	 */
 	do_action( 'enqueue_block_editor_assets' );
 }
-
-/**
- * Ensure the editor module is loaded before third party plugins.
- *
- * Remove this in Gutenberg 3.1
- */
-function polyfill_blocks_module_in_scripts() {
-	if ( ! is_gutenberg_page() ) {
-		return;
-	}
-
-	wp_enqueue_script( 'wp-editor' );
-}
-
-add_action( 'enqueue_block_editor_assets', 'polyfill_blocks_module_in_scripts', 9 );
-add_action( 'enqueue_block_assets', 'polyfill_blocks_module_in_scripts', 9 );
diff --git a/lib/compat.php b/lib/compat.php
index 44b2c8d3f94b4..1c33d2cf38c32 100644
--- a/lib/compat.php
+++ b/lib/compat.php
@@ -86,6 +86,39 @@ function gutenberg_disable_editor_settings_wpautop( $settings ) {
 }
 add_filter( 'wp_editor_settings', 'gutenberg_disable_editor_settings_wpautop' );
 
+/**
+ * Add TinyMCE fixes for the Classic Editor.
+ *
+ * @see https://core.trac.wordpress.org/ticket/44308
+ */
+function gutenberg_add_classic_editor_fixes() {
+	// Temp add the fix for not creating paragraphs from HTML comments.
+	// TODO: remove after 4.9.7, this should be in core.
+	$script = <<<JS
+jQuery( document ).on( 'tinymce-editor-setup', function( event, editor ) {
+	var hasWpautop = ( window.wp && window.wp.editor && window.wp.editor.autop && editor.getParam( 'wpautop', true ) );
+
+	editor.on( 'BeforeSetContent', function( event ) {
+		if ( event.load && event.format !== 'raw' && ! hasWpautop ) {
+			// Prevent creation of paragraphs out of multiple HTML comments.
+			event.content = event.content.replace( /-->\s+<!--/g, '--><!--' );
+		}
+	});
+
+	editor.on( 'SaveContent', function( event ) {
+		if ( ! hasWpautop ) {
+			// Restore formatting of block boundaries.
+			event.content = event.content.replace( /-->\s*<!-- wp:/g, '-->\\n\\n<!-- wp:' );
+		}
+	});
+});
+JS;
+
+	wp_add_inline_script( 'editor', $script, 'before' );
+
+}
+add_action( 'init', 'gutenberg_add_classic_editor_fixes' );
+
 /**
  * Add rest nonce to the heartbeat response.
  *
diff --git a/lib/rest-api.php b/lib/rest-api.php
index 61a7b33a18707..5ea4e44916585 100644
--- a/lib/rest-api.php
+++ b/lib/rest-api.php
@@ -341,6 +341,48 @@ function gutenberg_add_target_schema_to_links( $response, $post, $request ) {
 	return $response;
 }
 
+/**
+ * Include revisions data on post response links.
+ *
+ * @see https://core.trac.wordpress.org/ticket/44321
+ *
+ * @param WP_REST_Response $response WP REST API response of a post.
+ * @param WP_Post          $post The post being returned.
+ * @param WP_REST_Request  $request WP REST API request.
+ * @return WP_REST_Response Response containing the new links.
+ */
+function gutenberg_add_revisions_data_to_links( $response, $post, $request ) {
+
+	$new_links  = array();
+	$orig_links = $response->get_links();
+
+	if ( ! empty( $orig_links['version-history'] ) ) {
+		$version_history_link = array_shift( $orig_links['version-history'] );
+		// 'version-history' already exists and we don't want to duplicate it.
+		$response->remove_link( 'version-history' );
+
+		$revisions       = wp_get_post_revisions( $post->ID, array( 'fields' => 'ids' ) );
+		$revisions_count = count( $revisions );
+
+		$new_links['version-history'] = array(
+			'href'  => $version_history_link['href'],
+			'count' => $revisions_count,
+		);
+
+		if ( $revisions_count > 0 ) {
+			$last_revision = array_shift( $revisions );
+
+			$new_links['predecessor-version'] = array(
+				'href' => $version_history_link['href'] . '/' . $last_revision,
+				'id'   => $last_revision,
+			);
+		}
+	}
+
+	$response->add_links( $new_links );
+	return $response;
+}
+
 /**
  * Whenever a post type is registered, ensure we're hooked into it's WP REST API response.
  *
@@ -351,6 +393,7 @@ function gutenberg_register_post_prepare_functions( $post_type ) {
 	add_filter( "rest_prepare_{$post_type}", 'gutenberg_add_permalink_template_to_posts', 10, 3 );
 	add_filter( "rest_prepare_{$post_type}", 'gutenberg_add_block_format_to_post_content', 10, 3 );
 	add_filter( "rest_prepare_{$post_type}", 'gutenberg_add_target_schema_to_links', 10, 3 );
+	add_filter( "rest_prepare_{$post_type}", 'gutenberg_add_revisions_data_to_links', 10, 3 );
 	add_filter( "rest_{$post_type}_collection_params", 'gutenberg_filter_post_collection_parameters', 10, 2 );
 	add_filter( "rest_{$post_type}_query", 'gutenberg_filter_post_query_arguments', 10, 2 );
 	return $post_type;
@@ -368,118 +411,6 @@ function gutenberg_register_taxonomy_prepare_functions( $taxonomy ) {
 }
 add_filter( 'registered_taxonomy', 'gutenberg_register_taxonomy_prepare_functions' );
 
-/**
- * Includes the value for the 'viewable' attribute of a post type resource.
- *
- * @see https://core.trac.wordpress.org/ticket/43739
- *
- * @param object $post_type Post type response object.
- * @return boolean Whether or not the post type can be viewed.
- */
-function gutenberg_get_post_type_viewable( $post_type ) {
-	return is_post_type_viewable( $post_type['slug'] );
-}
-
-/**
- * Adds the 'viewable' attribute to the REST API response of a post type.
- *
- * @see https://core.trac.wordpress.org/ticket/43739
- */
-function gutenberg_register_rest_api_post_type_viewable() {
-	register_rest_field( 'type',
-		'viewable',
-		array(
-			'get_callback' => 'gutenberg_get_post_type_viewable',
-			'schema'       => array(
-				'description' => __( 'Whether or not the post type can be viewed', 'gutenberg' ),
-				'type'        => 'boolean',
-				'context'     => array( 'edit' ),
-				'readonly'    => true,
-			),
-		)
-	);
-}
-add_action( 'rest_api_init', 'gutenberg_register_rest_api_post_type_viewable' );
-
-/**
- * Gets revisions details for the selected post.
- *
- * @since 1.6.0
- *
- * @param array $post The post object from the response.
- * @return array|null Revisions details or null when no revisions present.
- */
-function gutenberg_get_post_revisions( $post ) {
-	$revisions       = wp_get_post_revisions( $post['id'] );
-	$revisions_count = count( $revisions );
-	if ( 0 === $revisions_count ) {
-		return null;
-	}
-
-	$last_revision = array_shift( $revisions );
-
-	return array(
-		'count'   => $revisions_count,
-		'last_id' => $last_revision->ID,
-	);
-}
-
-/**
- * Adds the custom field `revisions` to the REST API response of post.
- *
- * TODO: This is a temporary solution. Next step would be to find a solution that is limited to the editor.
- *
- * @since 1.6.0
- */
-function gutenberg_register_rest_api_post_revisions() {
-	register_rest_field( get_post_types( '', 'names' ),
-		'revisions',
-		array(
-			'get_callback' => 'gutenberg_get_post_revisions',
-		)
-	);
-}
-add_action( 'rest_api_init', 'gutenberg_register_rest_api_post_revisions' );
-
-/**
- * Get the preview link for the post object.
- *
- * @see https://github.com/WordPress/gutenberg/issues/4555
- *
- * @param WP_Post $post Post object.
- * @return string
- */
-function gutenberg_get_post_preview_link( $post ) {
-	return get_preview_post_link( $post['id'] );
-}
-
-/**
- * Adds the 'preview_link' attribute to the REST API response of a post.
- *
- * @see https://github.com/WordPress/gutenberg/issues/4555
- */
-function gutenberg_register_rest_api_post_preview_link() {
-	foreach ( get_post_types( array( 'show_in_rest' => true ), 'names' ) as $post_type ) {
-		if ( ! is_post_type_viewable( $post_type ) ) {
-			continue;
-		}
-		register_rest_field( $post_type,
-			'preview_link',
-			array(
-				'get_callback' => 'gutenberg_get_post_preview_link',
-				'schema'       => array(
-					'description' => __( 'Preview link for the post.', 'gutenberg' ),
-					'type'        => 'string',
-					'format'      => 'uri',
-					'context'     => array( 'edit' ),
-					'readonly'    => true,
-				),
-			)
-		);
-	}
-}
-add_action( 'rest_api_init', 'gutenberg_register_rest_api_post_preview_link' );
-
 /**
  * Ensure that the wp-json index contains the 'theme-supports' setting as
  * part of its site info elements.
diff --git a/nux/README.md b/nux/README.md
index d3c9f069a9f88..ecb389f7095cf 100644
--- a/nux/README.md
+++ b/nux/README.md
@@ -42,24 +42,33 @@ console.log( isVisible ); // true or false
 <button
 	onClick={ () => {
 		dispatch( 'core/nux' ).dismissTip( 'acme/add-to-cart' );
-	}
+	} }
 >
 	Dismiss tip
 </button>
 ```
 
-## Manually disabling tips
+## Disabling and enabling tips
 
-`disableTips` is a dispatch method that allows you to programmatically disable all tips.
+Tips can be programatically disabled or enabled using the `disableTips` and `enableTips` dispatch methods. You can query the current setting by using the `areTipsEnabled` select method.
+
+Calling `enableTips` will also un-dismiss all previously dismissed tips.
 
 ```jsx
-<button
-	onClick={ () => {
-		dispatch( 'core/nux' ).disableTips();
-	}
->
-	Disable tips
-</button>
+const areTipsEnabled = select( 'core/nux' ).areTipsEnabled();
+return (
+	<button
+		onClick={ () => {
+			if ( areTipsEnabled ) {
+				dispatch( 'core/nux' ).disableTips();
+			} else {
+				dispatch( 'core/nux' ).enableTips();
+			}
+		} }
+	>
+		{ areTipsEnabled ? 'Disable tips' : 'Enable tips' }
+	</button>
+);
 ```
 
 ## Triggering a guide
diff --git a/nux/components/dot-tip/index.js b/nux/components/dot-tip/index.js
index cba257d4af36d..dff0072904164 100644
--- a/nux/components/dot-tip/index.js
+++ b/nux/components/dot-tip/index.js
@@ -38,7 +38,7 @@ export class DotTip extends Component {
 	}
 
 	render() {
-		const { children, isVisible, hasNextTip, onDismiss } = this.props;
+		const { children, isVisible, hasNextTip, onDismiss, onDisable } = this.props;
 
 		if ( ! isVisible ) {
 			return null;
@@ -65,8 +65,8 @@ export class DotTip extends Component {
 				<IconButton
 					className="nux-dot-tip__disable"
 					icon="no-alt"
-					label={ __( 'Dismiss tip' ) }
-					onClick={ onDismiss }
+					label={ __( 'Disable tips' ) }
+					onClick={ onDisable }
 				/>
 			</Popover>
 		);
@@ -83,11 +83,14 @@ export default compose(
 		};
 	} ),
 	withDispatch( ( dispatch, { id } ) => {
-		const { dismissTip } = dispatch( 'core/nux' );
+		const { dismissTip, disableTips } = dispatch( 'core/nux' );
 		return {
 			onDismiss() {
 				dismissTip( id );
 			},
+			onDisable() {
+				disableTips();
+			},
 		};
 	} ),
 )( DotTip );
diff --git a/nux/components/dot-tip/test/__snapshots__/index.js.snap b/nux/components/dot-tip/test/__snapshots__/index.js.snap
index a3a6773f5261f..94a5c67a885a6 100644
--- a/nux/components/dot-tip/test/__snapshots__/index.js.snap
+++ b/nux/components/dot-tip/test/__snapshots__/index.js.snap
@@ -23,7 +23,7 @@ exports[`DotTip should render correctly 1`] = `
   <IconButton
     className="nux-dot-tip__disable"
     icon="no-alt"
-    label="Dismiss tip"
+    label="Disable tips"
   />
 </Popover>
 `;
diff --git a/nux/components/dot-tip/test/index.js b/nux/components/dot-tip/test/index.js
index 2f8bf4af2948a..a2c324bf04a21 100644
--- a/nux/components/dot-tip/test/index.js
+++ b/nux/components/dot-tip/test/index.js
@@ -38,14 +38,14 @@ describe( 'DotTip', () => {
 		expect( onDismiss ).toHaveBeenCalled();
 	} );
 
-	it( 'should call onDismiss when the X button is clicked', () => {
-		const onDismiss = jest.fn();
+	it( 'should call onDisable when the X button is clicked', () => {
+		const onDisable = jest.fn();
 		const wrapper = shallow(
-			<DotTip isVisible onDismiss={ onDismiss }>
+			<DotTip isVisible onDisable={ onDisable }>
 				It looks like you’re writing a letter. Would you like help?
 			</DotTip>
 		);
-		wrapper.find( 'IconButton[label="Dismiss tip"]' ).first().simulate( 'click' );
-		expect( onDismiss ).toHaveBeenCalled();
+		wrapper.find( 'IconButton[label="Disable tips"]' ).first().simulate( 'click' );
+		expect( onDisable ).toHaveBeenCalled();
 	} );
 } );
diff --git a/nux/store/actions.js b/nux/store/actions.js
index 95b14731ab06e..ad8adb79c5530 100644
--- a/nux/store/actions.js
+++ b/nux/store/actions.js
@@ -39,3 +39,14 @@ export function disableTips() {
 		type: 'DISABLE_TIPS',
 	};
 }
+
+/**
+ * Returns an action object that, when dispatched, makes all tips show again.
+ *
+ * @return {Object} Action object.
+ */
+export function enableTips() {
+	return {
+		type: 'ENABLE_TIPS',
+	};
+}
diff --git a/nux/store/reducer.js b/nux/store/reducer.js
index e8ba1abb7b0a5..5ebf8ea394e70 100644
--- a/nux/store/reducer.js
+++ b/nux/store/reducer.js
@@ -25,16 +25,19 @@ export function guides( state = [], action ) {
 }
 
 /**
- * Reducer that tracks whether or not tips are globally disabled.
+ * Reducer that tracks whether or not tips are globally enabled.
  *
  * @param {boolean} state Current state.
  * @param {Object} action Dispatched action.
  *
  * @return {boolean} Updated state.
  */
-export function areTipsDisabled( state = false, action ) {
+export function areTipsEnabled( state = true, action ) {
 	switch ( action.type ) {
 		case 'DISABLE_TIPS':
+			return false;
+
+		case 'ENABLE_TIPS':
 			return true;
 	}
 
@@ -57,11 +60,14 @@ export function dismissedTips( state = {}, action ) {
 				...state,
 				[ action.id ]: true,
 			};
+
+		case 'ENABLE_TIPS':
+			return {};
 	}
 
 	return state;
 }
 
-const preferences = combineReducers( { areTipsDisabled, dismissedTips } );
+const preferences = combineReducers( { areTipsEnabled, dismissedTips } );
 
 export default combineReducers( { guides, preferences } );
diff --git a/nux/store/selectors.js b/nux/store/selectors.js
index bf7365df9f27f..61f0193d90f46 100644
--- a/nux/store/selectors.js
+++ b/nux/store/selectors.js
@@ -51,7 +51,7 @@ export const getAssociatedGuide = createSelector(
  * @return {boolean} Whether or not the given tip is showing.
  */
 export function isTipVisible( state, id ) {
-	if ( state.preferences.areTipsDisabled ) {
+	if ( ! state.preferences.areTipsEnabled ) {
 		return false;
 	}
 
@@ -66,3 +66,14 @@ export function isTipVisible( state, id ) {
 
 	return true;
 }
+
+/**
+ * Returns whether or not tips are globally enabled.
+ *
+ * @param {Object} state Global application state.
+ *
+ * @return {boolean} Whether tips are globally enabled.
+ */
+export function areTipsEnabled( state ) {
+	return state.preferences.areTipsEnabled;
+}
diff --git a/nux/store/test/actions.js b/nux/store/test/actions.js
index 1aa4d0cf6f2e3..4e22afe03c8b8 100644
--- a/nux/store/test/actions.js
+++ b/nux/store/test/actions.js
@@ -1,7 +1,7 @@
 /**
  * Internal dependencies
  */
-import { triggerGuide, dismissTip, disableTips } from '../actions';
+import { triggerGuide, dismissTip, disableTips, enableTips } from '../actions';
 
 describe( 'actions', () => {
 	describe( 'triggerGuide', () => {
@@ -29,4 +29,12 @@ describe( 'actions', () => {
 			} );
 		} );
 	} );
+
+	describe( 'enableTips', () => {
+		it( 'should return an ENABLE_TIPS action', () => {
+			expect( enableTips() ).toEqual( {
+				type: 'ENABLE_TIPS',
+			} );
+		} );
+	} );
 } );
diff --git a/nux/store/test/reducer.js b/nux/store/test/reducer.js
index a40fabdf49f84..d2982a87d7050 100644
--- a/nux/store/test/reducer.js
+++ b/nux/store/test/reducer.js
@@ -1,7 +1,7 @@
 /**
  * Internal dependencies
  */
-import { guides, areTipsDisabled, dismissedTips } from '../reducer';
+import { guides, areTipsEnabled, dismissedTips } from '../reducer';
 
 describe( 'reducer', () => {
 	describe( 'guides', () => {
@@ -20,15 +20,22 @@ describe( 'reducer', () => {
 		} );
 	} );
 
-	describe( 'areTipsDisabled', () => {
-		it( 'should default to false', () => {
-			expect( areTipsDisabled( undefined, {} ) ).toBe( false );
+	describe( 'areTipsEnabled', () => {
+		it( 'should default to true', () => {
+			expect( areTipsEnabled( undefined, {} ) ).toBe( true );
 		} );
 
 		it( 'should flip when tips are disabled', () => {
-			const state = areTipsDisabled( false, {
+			const state = areTipsEnabled( true, {
 				type: 'DISABLE_TIPS',
 			} );
+			expect( state ).toBe( false );
+		} );
+
+		it( 'should flip when tips are enabled', () => {
+			const state = areTipsEnabled( false, {
+				type: 'ENABLE_TIPS',
+			} );
 			expect( state ).toBe( true );
 		} );
 	} );
@@ -47,5 +54,15 @@ describe( 'reducer', () => {
 				'test/tip': true,
 			} );
 		} );
+
+		it( 'should reset if tips are enabled', () => {
+			const initialState = {
+				'test/tip': true,
+			};
+			const state = dismissedTips( initialState, {
+				type: 'ENABLE_TIPS',
+			} );
+			expect( state ).toEqual( {} );
+		} );
 	} );
 } );
diff --git a/nux/store/test/selectors.js b/nux/store/test/selectors.js
index 08f6c7eea38f6..ed63a7fa828de 100644
--- a/nux/store/test/selectors.js
+++ b/nux/store/test/selectors.js
@@ -1,7 +1,7 @@
 /**
  * Internal dependencies
  */
-import { getAssociatedGuide, isTipVisible } from '../selectors';
+import { getAssociatedGuide, isTipVisible, areTipsEnabled } from '../selectors';
 
 describe( 'selectors', () => {
 	describe( 'getAssociatedGuide', () => {
@@ -57,7 +57,7 @@ describe( 'selectors', () => {
 			const state = {
 				guides: [],
 				preferences: {
-					areTipsDisabled: false,
+					areTipsEnabled: true,
 					dismissedTips: {},
 				},
 			};
@@ -68,7 +68,7 @@ describe( 'selectors', () => {
 			const state = {
 				guides: [],
 				preferences: {
-					areTipsDisabled: true,
+					areTipsEnabled: false,
 					dismissedTips: {},
 				},
 			};
@@ -79,7 +79,7 @@ describe( 'selectors', () => {
 			const state = {
 				guides: [],
 				preferences: {
-					areTipsDisabled: false,
+					areTipsEnabled: true,
 					dismissedTips: {
 						'test/tip': true,
 					},
@@ -94,11 +94,35 @@ describe( 'selectors', () => {
 					[ 'test/tip-1', 'test/tip-2', 'test/tip-3' ],
 				],
 				preferences: {
-					areTipsDisabled: false,
+					areTipsEnabled: true,
 					dismissedTips: {},
 				},
 			};
 			expect( isTipVisible( state, 'test/tip-2' ) ).toBe( false );
 		} );
 	} );
+
+	describe( 'areTipsEnabled', () => {
+		it( 'should return true if tips are enabled', () => {
+			const state = {
+				guides: [],
+				preferences: {
+					areTipsEnabled: true,
+					dismissedTips: {},
+				},
+			};
+			expect( areTipsEnabled( state ) ).toBe( true );
+		} );
+
+		it( 'should return false if tips are disabled', () => {
+			const state = {
+				guides: [],
+				preferences: {
+					areTipsEnabled: false,
+					dismissedTips: {},
+				},
+			};
+			expect( areTipsEnabled( state ) ).toBe( false );
+		} );
+	} );
 } );
diff --git a/package-lock.json b/package-lock.json
index ef49550bd7b68..561d4a00e6582 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,14 +1,11 @@
 {
-	"name": "gutenberg",
-	"version": "3.0.1",
-	"lockfileVersion": 1,
 	"requires": true,
+	"lockfileVersion": 1,
 	"dependencies": {
 		"@babel/code-frame": {
 			"version": "7.0.0-beta.49",
 			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0-beta.49.tgz",
 			"integrity": "sha1-vs2AVIJzREDJ0TfkbXc0DmTX9Rs=",
-			"dev": true,
 			"requires": {
 				"@babel/highlight": "7.0.0-beta.49"
 			}
@@ -17,7 +14,6 @@
 			"version": "7.0.0-beta.31",
 			"resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.31.tgz",
 			"integrity": "sha512-c+DAyp8LMm2nzSs2uXEuxp4LYGSUYEyHtU3fU57avFChjsnTmmpWmXj2dv0yUxHTEydgVAv5fIzA+4KJwoqWDA==",
-			"dev": true,
 			"requires": {
 				"@babel/helper-get-function-arity": "7.0.0-beta.31",
 				"@babel/template": "7.0.0-beta.31",
@@ -29,7 +25,6 @@
 			"version": "7.0.0-beta.31",
 			"resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.31.tgz",
 			"integrity": "sha512-m7rVVX/dMLbbB9NCzKYRrrFb0qZxgpmQ4Wv6y7zEsB6skoJHRuXVeb/hAFze79vXBbuD63ci7AVHXzAdZSk9KQ==",
-			"dev": true,
 			"requires": {
 				"@babel/types": "7.0.0-beta.31"
 			}
@@ -38,7 +33,6 @@
 			"version": "7.0.0-beta.49",
 			"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0-beta.49.tgz",
 			"integrity": "sha1-lr3GtD4TSCASumaRsQGEktOWIsw=",
-			"dev": true,
 			"requires": {
 				"chalk": "^2.0.0",
 				"esutils": "^2.0.2",
@@ -49,7 +43,6 @@
 			"version": "7.0.0-beta.31",
 			"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.0.0-beta.31.tgz",
 			"integrity": "sha512-97IRmLvoDhIDSQkqklVt3UCxJsv0LUEVb/0DzXWtc8Lgiyxj567qZkmTG9aR21CmcJVVIvq2Y/moZj4oEpl5AA==",
-			"dev": true,
 			"requires": {
 				"@babel/code-frame": "7.0.0-beta.31",
 				"@babel/types": "7.0.0-beta.31",
@@ -61,7 +54,6 @@
 					"version": "7.0.0-beta.31",
 					"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0-beta.31.tgz",
 					"integrity": "sha512-yd7CkUughvHQoEahQqcMdrZw6o/6PwUxiRkfZuVDVHCDe77mysD/suoNyk5mK6phTnRW1kyIbPHyCJgxw++LXg==",
-					"dev": true,
 					"requires": {
 						"chalk": "^2.0.0",
 						"esutils": "^2.0.2",
@@ -71,8 +63,7 @@
 				"babylon": {
 					"version": "7.0.0-beta.31",
 					"resolved": "https://registry.npmjs.org/babylon/-/babylon-7.0.0-beta.31.tgz",
-					"integrity": "sha512-6lm2mV3S51yEnKmQQNnswoABL1U1H1KHoCCVwdwI3hvIv+W7ya4ki7Aw4o4KxtUHjNKkK5WpZb22rrMMOcJXJQ==",
-					"dev": true
+					"integrity": "sha512-6lm2mV3S51yEnKmQQNnswoABL1U1H1KHoCCVwdwI3hvIv+W7ya4ki7Aw4o4KxtUHjNKkK5WpZb22rrMMOcJXJQ=="
 				}
 			}
 		},
@@ -80,7 +71,6 @@
 			"version": "7.0.0-beta.31",
 			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.0.0-beta.31.tgz",
 			"integrity": "sha512-3N+VJW+KlezEjFBG7WSYeMyC5kIqVLPb/PGSzCDPFcJrnArluD1GIl7Y3xC7cjKiTq2/JohaLWHVPjJWHlo9Gg==",
-			"dev": true,
 			"requires": {
 				"@babel/code-frame": "7.0.0-beta.31",
 				"@babel/helper-function-name": "7.0.0-beta.31",
@@ -96,7 +86,6 @@
 					"version": "7.0.0-beta.31",
 					"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0-beta.31.tgz",
 					"integrity": "sha512-yd7CkUughvHQoEahQqcMdrZw6o/6PwUxiRkfZuVDVHCDe77mysD/suoNyk5mK6phTnRW1kyIbPHyCJgxw++LXg==",
-					"dev": true,
 					"requires": {
 						"chalk": "^2.0.0",
 						"esutils": "^2.0.2",
@@ -106,14 +95,12 @@
 				"babylon": {
 					"version": "7.0.0-beta.31",
 					"resolved": "https://registry.npmjs.org/babylon/-/babylon-7.0.0-beta.31.tgz",
-					"integrity": "sha512-6lm2mV3S51yEnKmQQNnswoABL1U1H1KHoCCVwdwI3hvIv+W7ya4ki7Aw4o4KxtUHjNKkK5WpZb22rrMMOcJXJQ==",
-					"dev": true
+					"integrity": "sha512-6lm2mV3S51yEnKmQQNnswoABL1U1H1KHoCCVwdwI3hvIv+W7ya4ki7Aw4o4KxtUHjNKkK5WpZb22rrMMOcJXJQ=="
 				},
 				"debug": {
 					"version": "3.1.0",
 					"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
 					"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-					"dev": true,
 					"requires": {
 						"ms": "2.0.0"
 					}
@@ -121,8 +108,7 @@
 				"globals": {
 					"version": "10.4.0",
 					"resolved": "https://registry.npmjs.org/globals/-/globals-10.4.0.tgz",
-					"integrity": "sha512-uNUtxIZpGyuaq+5BqGGQHsL4wUlJAXRqOm6g3Y48/CWNGTLONgBibI0lh6lGxjR2HljFYUfszb+mk4WkgMntsA==",
-					"dev": true
+					"integrity": "sha512-uNUtxIZpGyuaq+5BqGGQHsL4wUlJAXRqOm6g3Y48/CWNGTLONgBibI0lh6lGxjR2HljFYUfszb+mk4WkgMntsA=="
 				}
 			}
 		},
@@ -130,7 +116,6 @@
 			"version": "7.0.0-beta.31",
 			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.0.0-beta.31.tgz",
 			"integrity": "sha512-exAHB+NeFGxkfQ5dSUD03xl3zYGneeSk2Mw2ldTt/nTvYxuDiuSp3DlxgUBgzbdTFG4fbwPk0WtKWOoTXCmNGg==",
-			"dev": true,
 			"requires": {
 				"esutils": "^2.0.2",
 				"lodash": "^4.2.0",
@@ -140,8 +125,7 @@
 				"to-fast-properties": {
 					"version": "2.0.0",
 					"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-					"integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
-					"dev": true
+					"integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4="
 				}
 			}
 		},
@@ -149,7 +133,6 @@
 			"version": "2.2.1",
 			"resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz",
 			"integrity": "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==",
-			"dev": true,
 			"requires": {
 				"call-me-maybe": "^1.0.1",
 				"glob-to-regexp": "^0.3.0"
@@ -158,14 +141,12 @@
 		"@nodelib/fs.stat": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.0.2.tgz",
-			"integrity": "sha512-vCpf75JDcdomXvUd7Rn6DfYAVqPAFI66FVjxiWGwh85OLdvfo3paBoPJaam5keIYRyUolnS7SleS/ZPCidCvzw==",
-			"dev": true
+			"integrity": "sha512-vCpf75JDcdomXvUd7Rn6DfYAVqPAFI66FVjxiWGwh85OLdvfo3paBoPJaam5keIYRyUolnS7SleS/ZPCidCvzw=="
 		},
 		"@romainberger/css-diff": {
 			"version": "1.0.3",
 			"resolved": "https://registry.npmjs.org/@romainberger/css-diff/-/css-diff-1.0.3.tgz",
 			"integrity": "sha1-ztOHU11PQqQqwf4TwJ3pf1rhNEw=",
-			"dev": true,
 			"requires": {
 				"lodash.merge": "^4.4.0",
 				"postcss": "^5.0.21"
@@ -174,14 +155,12 @@
 				"ansi-styles": {
 					"version": "2.2.1",
 					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-					"dev": true
+					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
 				},
 				"chalk": {
 					"version": "1.1.3",
 					"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
 					"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-					"dev": true,
 					"requires": {
 						"ansi-styles": "^2.2.1",
 						"escape-string-regexp": "^1.0.2",
@@ -193,22 +172,19 @@
 						"supports-color": {
 							"version": "2.0.0",
 							"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-							"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-							"dev": true
+							"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
 						}
 					}
 				},
 				"has-flag": {
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-					"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-					"dev": true
+					"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
 				},
 				"postcss": {
 					"version": "5.2.18",
 					"resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
 					"integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-					"dev": true,
 					"requires": {
 						"chalk": "^1.1.3",
 						"js-base64": "^2.1.9",
@@ -219,14 +195,12 @@
 				"source-map": {
 					"version": "0.5.7",
 					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-					"dev": true
+					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
 				},
 				"supports-color": {
 					"version": "3.2.3",
 					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
 					"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-					"dev": true,
 					"requires": {
 						"has-flag": "^1.0.0"
 					}
@@ -236,20 +210,17 @@
 		"@sindresorhus/is": {
 			"version": "0.7.0",
 			"resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz",
-			"integrity": "sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==",
-			"dev": true
+			"integrity": "sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow=="
 		},
 		"@types/node": {
 			"version": "10.1.2",
 			"resolved": "https://registry.npmjs.org/@types/node/-/node-10.1.2.tgz",
-			"integrity": "sha512-bjk1RIeZBCe/WukrFToIVegOf91Pebr8cXYBwLBIsfiGWVQ+ifwWsT59H3RxrWzWrzd1l/Amk1/ioY5Fq3/bpA==",
-			"dev": true
+			"integrity": "sha512-bjk1RIeZBCe/WukrFToIVegOf91Pebr8cXYBwLBIsfiGWVQ+ifwWsT59H3RxrWzWrzd1l/Amk1/ioY5Fq3/bpA=="
 		},
 		"@webassemblyjs/ast": {
 			"version": "1.4.3",
 			"resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.4.3.tgz",
 			"integrity": "sha512-S6npYhPcTHDYe9nlsKa9CyWByFi8Vj8HovcAgtmMAQZUOczOZbQ8CnwMYKYC5HEZzxEE+oY0jfQk4cVlI3J59Q==",
-			"dev": true,
 			"requires": {
 				"@webassemblyjs/helper-wasm-bytecode": "1.4.3",
 				"@webassemblyjs/wast-parser": "1.4.3",
@@ -261,7 +232,6 @@
 					"version": "3.1.0",
 					"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
 					"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-					"dev": true,
 					"requires": {
 						"ms": "2.0.0"
 					}
@@ -271,14 +241,12 @@
 		"@webassemblyjs/floating-point-hex-parser": {
 			"version": "1.4.3",
 			"resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.4.3.tgz",
-			"integrity": "sha512-3zTkSFswwZOPNHnzkP9ONq4bjJSeKVMcuahGXubrlLmZP8fmTIJ58dW7h/zOVWiFSuG2em3/HH3BlCN7wyu9Rw==",
-			"dev": true
+			"integrity": "sha512-3zTkSFswwZOPNHnzkP9ONq4bjJSeKVMcuahGXubrlLmZP8fmTIJ58dW7h/zOVWiFSuG2em3/HH3BlCN7wyu9Rw=="
 		},
 		"@webassemblyjs/helper-buffer": {
 			"version": "1.4.3",
 			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.4.3.tgz",
 			"integrity": "sha512-e8+KZHh+RV8MUvoSRtuT1sFXskFnWG9vbDy47Oa166xX+l0dD5sERJ21g5/tcH8Yo95e9IN3u7Jc3NbhnUcSkw==",
-			"dev": true,
 			"requires": {
 				"debug": "^3.1.0"
 			},
@@ -287,7 +255,6 @@
 					"version": "3.1.0",
 					"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
 					"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-					"dev": true,
 					"requires": {
 						"ms": "2.0.0"
 					}
@@ -298,7 +265,6 @@
 			"version": "1.4.3",
 			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.4.3.tgz",
 			"integrity": "sha512-9FgHEtNsZQYaKrGCtsjswBil48Qp1agrzRcPzCbQloCoaTbOXLJ9IRmqT+uEZbenpULLRNFugz3I4uw18hJM8w==",
-			"dev": true,
 			"requires": {
 				"@webassemblyjs/wast-printer": "1.4.3"
 			}
@@ -306,20 +272,17 @@
 		"@webassemblyjs/helper-fsm": {
 			"version": "1.4.3",
 			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.4.3.tgz",
-			"integrity": "sha512-JINY76U+702IRf7ePukOt037RwmtH59JHvcdWbTTyHi18ixmQ+uOuNhcdCcQHTquDAH35/QgFlp3Y9KqtyJsCQ==",
-			"dev": true
+			"integrity": "sha512-JINY76U+702IRf7ePukOt037RwmtH59JHvcdWbTTyHi18ixmQ+uOuNhcdCcQHTquDAH35/QgFlp3Y9KqtyJsCQ=="
 		},
 		"@webassemblyjs/helper-wasm-bytecode": {
 			"version": "1.4.3",
 			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.4.3.tgz",
-			"integrity": "sha512-I7bS+HaO0K07Io89qhJv+z1QipTpuramGwUSDkwEaficbSvCcL92CUZEtgykfNtk5wb0CoLQwWlmXTwGbNZUeQ==",
-			"dev": true
+			"integrity": "sha512-I7bS+HaO0K07Io89qhJv+z1QipTpuramGwUSDkwEaficbSvCcL92CUZEtgykfNtk5wb0CoLQwWlmXTwGbNZUeQ=="
 		},
 		"@webassemblyjs/helper-wasm-section": {
 			"version": "1.4.3",
 			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.4.3.tgz",
 			"integrity": "sha512-p0yeeO/h2r30PyjnJX9xXSR6EDcvJd/jC6xa/Pxg4lpfcNi7JUswOpqDToZQ55HMMVhXDih/yqkaywHWGLxqyQ==",
-			"dev": true,
 			"requires": {
 				"@webassemblyjs/ast": "1.4.3",
 				"@webassemblyjs/helper-buffer": "1.4.3",
@@ -332,7 +295,6 @@
 					"version": "3.1.0",
 					"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
 					"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-					"dev": true,
 					"requires": {
 						"ms": "2.0.0"
 					}
@@ -343,7 +305,6 @@
 			"version": "1.4.3",
 			"resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.4.3.tgz",
 			"integrity": "sha512-4u0LJLSPzuRDWHwdqsrThYn+WqMFVqbI2ltNrHvZZkzFPO8XOZ0HFQ5eVc4jY/TNHgXcnwrHjONhPGYuuf//KQ==",
-			"dev": true,
 			"requires": {
 				"leb": "^0.3.0"
 			}
@@ -352,7 +313,6 @@
 			"version": "1.4.3",
 			"resolved": "https://registry.npmjs.org/@webassemblyjs/validation/-/validation-1.4.3.tgz",
 			"integrity": "sha512-R+rRMKfhd9mq0rj2mhU9A9NKI2l/Rw65vIYzz4lui7eTKPcCu1l7iZNi4b9Gen8D42Sqh/KGiaQNk/x5Tn/iBQ==",
-			"dev": true,
 			"requires": {
 				"@webassemblyjs/ast": "1.4.3"
 			}
@@ -361,7 +321,6 @@
 			"version": "1.4.3",
 			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.4.3.tgz",
 			"integrity": "sha512-qzuwUn771PV6/LilqkXcS0ozJYAeY/OKbXIWU3a8gexuqb6De2p4ya/baBeH5JQ2WJdfhWhSvSbu86Vienttpw==",
-			"dev": true,
 			"requires": {
 				"@webassemblyjs/ast": "1.4.3",
 				"@webassemblyjs/helper-buffer": "1.4.3",
@@ -378,7 +337,6 @@
 					"version": "3.1.0",
 					"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
 					"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-					"dev": true,
 					"requires": {
 						"ms": "2.0.0"
 					}
@@ -389,7 +347,6 @@
 			"version": "1.4.3",
 			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.4.3.tgz",
 			"integrity": "sha512-eR394T8dHZfpLJ7U/Z5pFSvxl1L63JdREebpv9gYc55zLhzzdJPAuxjBYT4XqevUdW67qU2s0nNA3kBuNJHbaQ==",
-			"dev": true,
 			"requires": {
 				"@webassemblyjs/ast": "1.4.3",
 				"@webassemblyjs/helper-wasm-bytecode": "1.4.3",
@@ -400,7 +357,6 @@
 			"version": "1.4.3",
 			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.4.3.tgz",
 			"integrity": "sha512-7Gp+nschuKiDuAL1xmp4Xz0rgEbxioFXw4nCFYEmy+ytynhBnTeGc9W9cB1XRu1w8pqRU2lbj2VBBA4cL5Z2Kw==",
-			"dev": true,
 			"requires": {
 				"@webassemblyjs/ast": "1.4.3",
 				"@webassemblyjs/helper-buffer": "1.4.3",
@@ -413,7 +369,6 @@
 					"version": "3.1.0",
 					"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
 					"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-					"dev": true,
 					"requires": {
 						"ms": "2.0.0"
 					}
@@ -424,7 +379,6 @@
 			"version": "1.4.3",
 			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.4.3.tgz",
 			"integrity": "sha512-KXBjtlwA3BVukR/yWHC9GF+SCzBcgj0a7lm92kTOaa4cbjaTaa47bCjXw6cX4SGQpkncB9PU2hHGYVyyI7wFRg==",
-			"dev": true,
 			"requires": {
 				"@webassemblyjs/ast": "1.4.3",
 				"@webassemblyjs/helper-wasm-bytecode": "1.4.3",
@@ -437,7 +391,6 @@
 			"version": "1.4.3",
 			"resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.4.3.tgz",
 			"integrity": "sha512-QhCsQzqV0CpsEkRYyTzQDilCNUZ+5j92f+g35bHHNqS22FppNTywNFfHPq8ZWZfYCgbectc+PoghD+xfzVFh1Q==",
-			"dev": true,
 			"requires": {
 				"@webassemblyjs/ast": "1.4.3",
 				"@webassemblyjs/floating-point-hex-parser": "1.4.3",
@@ -451,7 +404,6 @@
 			"version": "1.4.3",
 			"resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.4.3.tgz",
 			"integrity": "sha512-EgXk4anf8jKmuZJsqD8qy5bz2frEQhBvZruv+bqwNoLWUItjNSFygk8ywL3JTEz9KtxTlAmqTXNrdD1d9gNDtg==",
-			"dev": true,
 			"requires": {
 				"@webassemblyjs/ast": "1.4.3",
 				"@webassemblyjs/wast-parser": "1.4.3",
@@ -475,7 +427,6 @@
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/@wordpress/babel-plugin-makepot/-/babel-plugin-makepot-1.0.1.tgz",
 			"integrity": "sha512-n0ifXqE4jbEWxz+tCj3IM2nPH9sgelQx2ApKTPJNrOOMJq29s6RRXcUYzN8g68rNakXAGuFLlIRmPzIGrA1wWA==",
-			"dev": true,
 			"requires": {
 				"gettext-parser": "^1.3.1",
 				"lodash": "^4.17.5"
@@ -485,7 +436,6 @@
 			"version": "1.3.0",
 			"resolved": "https://registry.npmjs.org/@wordpress/babel-preset-default/-/babel-preset-default-1.3.0.tgz",
 			"integrity": "sha512-xAw0qp9MJjPPNw0OS8cT3SCcPLVul3rJVwz+/KuJAJXuO/R3omGDX864FVuFDKFHZF+1jydXRW0GPih4MZ+6Lw==",
-			"dev": true,
 			"requires": {
 				"@wordpress/browserslist-config": "^2.1.4",
 				"babel-plugin-transform-async-generator-functions": "^6.24.1",
@@ -498,14 +448,12 @@
 		"@wordpress/browserslist-config": {
 			"version": "2.1.4",
 			"resolved": "https://registry.npmjs.org/@wordpress/browserslist-config/-/browserslist-config-2.1.4.tgz",
-			"integrity": "sha512-J8vd88IFsjYwYZSIVATDjWa0pH997zvQ6quor30UdwhqdZ4ZWxIh4AEADqZA3I4EwskWVmg9n9DF7jVUDZPxwg==",
-			"dev": true
+			"integrity": "sha512-J8vd88IFsjYwYZSIVATDjWa0pH997zvQ6quor30UdwhqdZ4ZWxIh4AEADqZA3I4EwskWVmg9n9DF7jVUDZPxwg=="
 		},
 		"@wordpress/custom-templated-path-webpack-plugin": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/@wordpress/custom-templated-path-webpack-plugin/-/custom-templated-path-webpack-plugin-1.0.2.tgz",
 			"integrity": "sha512-bm8lZo6YUMkrjcqxjPm0H3hz2nIKwLLXzz8RaOppo8FomkcaPSqmRl2N6Urwf9h9pKGh25K+5jyefKvhOMMw1A==",
-			"dev": true,
 			"requires": {
 				"escape-string-regexp": "^1.0.5"
 			}
@@ -540,7 +488,6 @@
 			"version": "1.0.7",
 			"resolved": "https://registry.npmjs.org/@wordpress/jest-console/-/jest-console-1.0.7.tgz",
 			"integrity": "sha512-cYV7jhhn9KW+kpGSYZxqu8YhOitEouHujt/XDYmfCK0gYr7SMWVYu4XSN9UHxz9GFQck/7mgVQlNC1Xvf/zWlw==",
-			"dev": true,
 			"requires": {
 				"jest-matcher-utils": "^22.4.0",
 				"lodash": "^4.17.4"
@@ -550,7 +497,6 @@
 			"version": "1.0.6",
 			"resolved": "https://registry.npmjs.org/@wordpress/jest-preset-default/-/jest-preset-default-1.0.6.tgz",
 			"integrity": "sha512-vM60YzKgGex7jhyRlkQSUoTkR4nVmicU0yTSs5mnYcScLhi94qHQqUp5qzWrntgqIBe1YaMzCrxmoTC+QqccgQ==",
-			"dev": true,
 			"requires": {
 				"@wordpress/jest-console": "^1.0.7",
 				"babel-jest": "^22.1.0",
@@ -563,14 +509,12 @@
 		"@wordpress/npm-package-json-lint-config": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/@wordpress/npm-package-json-lint-config/-/npm-package-json-lint-config-1.0.0.tgz",
-			"integrity": "sha512-6urMrDWGh56VpPVdrsJjOh4Xb3oe/xOj9Ah5nC0UG8zZyrlBNbUbniSwp6dzhRVQ/tSYtQBjEafxq96O3OY47w==",
-			"dev": true
+			"integrity": "sha512-6urMrDWGh56VpPVdrsJjOh4Xb3oe/xOj9Ah5nC0UG8zZyrlBNbUbniSwp6dzhRVQ/tSYtQBjEafxq96O3OY47w=="
 		},
 		"@wordpress/scripts": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/@wordpress/scripts/-/scripts-1.2.0.tgz",
 			"integrity": "sha512-3o2y5n4XmygXDVHi2hqmQUL589t3q0+H/t+LEqHVVvKt4R9MH/z32uTS9PjFsuxKfwfoOHwVYq+vqI5cO6B1OQ==",
-			"dev": true,
 			"requires": {
 				"@wordpress/babel-preset-default": "^1.3.0",
 				"@wordpress/jest-preset-default": "^1.0.6",
@@ -586,7 +530,6 @@
 					"version": "3.0.0",
 					"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz",
 					"integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=",
-					"dev": true,
 					"requires": {
 						"find-up": "^2.0.0",
 						"read-pkg": "^3.0.0"
@@ -619,8 +562,7 @@
 		"abab": {
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/abab/-/abab-1.0.4.tgz",
-			"integrity": "sha1-X6rZwsB/YN12dw9xzwJbYqY8/U4=",
-			"dev": true
+			"integrity": "sha1-X6rZwsB/YN12dw9xzwJbYqY8/U4="
 		},
 		"abbrev": {
 			"version": "1.1.1",
@@ -630,14 +572,12 @@
 		"acorn": {
 			"version": "5.5.3",
 			"resolved": "https://registry.npmjs.org/acorn/-/acorn-5.5.3.tgz",
-			"integrity": "sha512-jd5MkIUlbbmb07nXH0DT3y7rDVtkzDi4XZOUVWAer8ajmF/DTSSbl5oNFyDOl/OXA33Bl79+ypHhl2pN20VeOQ==",
-			"dev": true
+			"integrity": "sha512-jd5MkIUlbbmb07nXH0DT3y7rDVtkzDi4XZOUVWAer8ajmF/DTSSbl5oNFyDOl/OXA33Bl79+ypHhl2pN20VeOQ=="
 		},
 		"acorn-dynamic-import": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz",
 			"integrity": "sha512-zVWV8Z8lislJoOKKqdNMOB+s6+XV5WERty8MnKBeFgwA+19XJjJHs2RP5dzM57FftIs+jQnRToLiWazKr6sSWg==",
-			"dev": true,
 			"requires": {
 				"acorn": "^5.0.0"
 			}
@@ -646,7 +586,6 @@
 			"version": "4.1.0",
 			"resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.1.0.tgz",
 			"integrity": "sha512-KjZwU26uG3u6eZcfGbTULzFcsoz6pegNKtHPksZPOUsiKo5bUmiBPa38FuHZ/Eun+XYh/JCCkS9AS3Lu4McQOQ==",
-			"dev": true,
 			"requires": {
 				"acorn": "^5.0.0"
 			}
@@ -655,7 +594,6 @@
 			"version": "3.0.1",
 			"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz",
 			"integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=",
-			"dev": true,
 			"requires": {
 				"acorn": "^3.0.4"
 			},
@@ -663,8 +601,7 @@
 				"acorn": {
 					"version": "3.3.0",
 					"resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
-					"integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=",
-					"dev": true
+					"integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo="
 				}
 			}
 		},
@@ -677,7 +614,6 @@
 			"version": "4.2.0",
 			"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.2.0.tgz",
 			"integrity": "sha512-c+R/U5X+2zz2+UCrCFv6odQzJdoqI+YecuhnAJLa1zYaMc13zPfwMwZrr91Pd1DYNo/yPRbiM4WVf9whgwFsIg==",
-			"dev": true,
 			"requires": {
 				"es6-promisify": "^5.0.0"
 			}
@@ -686,7 +622,6 @@
 			"version": "5.5.2",
 			"resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
 			"integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
-			"dev": true,
 			"requires": {
 				"co": "^4.6.0",
 				"fast-deep-equal": "^1.0.0",
@@ -697,8 +632,7 @@
 		"ajv-keywords": {
 			"version": "3.2.0",
 			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.2.0.tgz",
-			"integrity": "sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo=",
-			"dev": true
+			"integrity": "sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo="
 		},
 		"align-text": {
 			"version": "0.1.4",
@@ -713,8 +647,7 @@
 		"alphanum-sort": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz",
-			"integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=",
-			"dev": true
+			"integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM="
 		},
 		"amdefine": {
 			"version": "1.0.1",
@@ -742,14 +675,12 @@
 		"any-observable": {
 			"version": "0.2.0",
 			"resolved": "https://registry.npmjs.org/any-observable/-/any-observable-0.2.0.tgz",
-			"integrity": "sha1-xnhwBYADV5AJCD9UrAq6+1wz0kI=",
-			"dev": true
+			"integrity": "sha1-xnhwBYADV5AJCD9UrAq6+1wz0kI="
 		},
 		"anymatch": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
 			"integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-			"dev": true,
 			"requires": {
 				"micromatch": "^3.1.4",
 				"normalize-path": "^2.1.1"
@@ -759,7 +690,6 @@
 			"version": "0.4.0",
 			"resolved": "https://registry.npmjs.org/append-transform/-/append-transform-0.4.0.tgz",
 			"integrity": "sha1-126/jKlNJ24keja61EpLdKthGZE=",
-			"dev": true,
 			"requires": {
 				"default-require-extensions": "^1.0.0"
 			}
@@ -782,7 +712,6 @@
 			"version": "1.0.10",
 			"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
 			"integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-			"dev": true,
 			"requires": {
 				"sprintf-js": "~1.0.2"
 			},
@@ -790,22 +719,19 @@
 				"sprintf-js": {
 					"version": "1.0.3",
 					"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-					"integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
-					"dev": true
+					"integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
 				}
 			}
 		},
 		"argv": {
 			"version": "0.0.2",
 			"resolved": "https://registry.npmjs.org/argv/-/argv-0.0.2.tgz",
-			"integrity": "sha1-7L0W+JSbFXGDcRsb2jNPN4QBhas=",
-			"dev": true
+			"integrity": "sha1-7L0W+JSbFXGDcRsb2jNPN4QBhas="
 		},
 		"aria-query": {
 			"version": "0.7.1",
 			"resolved": "https://registry.npmjs.org/aria-query/-/aria-query-0.7.1.tgz",
 			"integrity": "sha1-Jsu1r/ZBRLCoJb4YRuCxbPoAsR4=",
-			"dev": true,
 			"requires": {
 				"ast-types-flow": "0.0.7",
 				"commander": "^2.11.0"
@@ -814,32 +740,27 @@
 		"arr-diff": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-			"integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-			"dev": true
+			"integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA="
 		},
 		"arr-flatten": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
-			"integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
-			"dev": true
+			"integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg=="
 		},
 		"arr-union": {
 			"version": "3.1.0",
 			"resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
-			"integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
-			"dev": true
+			"integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ="
 		},
 		"array-differ": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz",
-			"integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=",
-			"dev": true
+			"integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE="
 		},
 		"array-equal": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz",
-			"integrity": "sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=",
-			"dev": true
+			"integrity": "sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM="
 		},
 		"array-find-index": {
 			"version": "1.0.2",
@@ -855,7 +776,6 @@
 			"version": "3.0.3",
 			"resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.0.3.tgz",
 			"integrity": "sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0=",
-			"dev": true,
 			"requires": {
 				"define-properties": "^1.1.2",
 				"es-abstract": "^1.7.0"
@@ -877,8 +797,7 @@
 		"array-unique": {
 			"version": "0.3.2",
 			"resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-			"integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
-			"dev": true
+			"integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg="
 		},
 		"arrify": {
 			"version": "1.0.1",
@@ -893,14 +812,12 @@
 		"asn1": {
 			"version": "0.2.3",
 			"resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
-			"integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=",
-			"dev": true
+			"integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y="
 		},
 		"asn1.js": {
 			"version": "4.10.1",
 			"resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
 			"integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
-			"dev": true,
 			"requires": {
 				"bn.js": "^4.0.0",
 				"inherits": "^2.0.1",
@@ -911,7 +828,6 @@
 			"version": "1.4.1",
 			"resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz",
 			"integrity": "sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=",
-			"dev": true,
 			"requires": {
 				"util": "0.10.3"
 			}
@@ -919,32 +835,27 @@
 		"assert-plus": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-			"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-			"dev": true
+			"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
 		},
 		"assign-symbols": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
-			"integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
-			"dev": true
+			"integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c="
 		},
 		"ast-types": {
 			"version": "0.11.3",
 			"resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.11.3.tgz",
-			"integrity": "sha512-XA5o5dsNw8MhyW0Q7MWXJWc4oOzZKbdsEJq45h7c8q/d9DwWZ5F2ugUc1PuMLPGsUnphCt/cNDHu8JeBbxf1qA==",
-			"dev": true
+			"integrity": "sha512-XA5o5dsNw8MhyW0Q7MWXJWc4oOzZKbdsEJq45h7c8q/d9DwWZ5F2ugUc1PuMLPGsUnphCt/cNDHu8JeBbxf1qA=="
 		},
 		"ast-types-flow": {
 			"version": "0.0.7",
 			"resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz",
-			"integrity": "sha1-9wtzXGvKGlycItmCw+Oef+ujva0=",
-			"dev": true
+			"integrity": "sha1-9wtzXGvKGlycItmCw+Oef+ujva0="
 		},
 		"astral-regex": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",
-			"integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==",
-			"dev": true
+			"integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg=="
 		},
 		"async": {
 			"version": "1.5.2",
@@ -954,38 +865,32 @@
 		"async-each": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz",
-			"integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=",
-			"dev": true
+			"integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0="
 		},
 		"async-foreach": {
 			"version": "0.1.3",
 			"resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz",
-			"integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=",
-			"dev": true
+			"integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI="
 		},
 		"async-limiter": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz",
-			"integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==",
-			"dev": true
+			"integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg=="
 		},
 		"asynckit": {
 			"version": "0.4.0",
 			"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-			"integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
-			"dev": true
+			"integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
 		},
 		"atob": {
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/atob/-/atob-2.1.1.tgz",
-			"integrity": "sha1-ri1acpR38onWDdf5amMUoi3Wwio=",
-			"dev": true
+			"integrity": "sha1-ri1acpR38onWDdf5amMUoi3Wwio="
 		},
 		"autoprefixer": {
 			"version": "8.2.0",
 			"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-8.2.0.tgz",
 			"integrity": "sha512-xBVQpGAcSNNS1PBnEfT+F9VF8ZJeoKZ121I3OVQ0n1F0SqVuj4oLI6yFeEviPV8Z/GjoqBRXcYis0oSS8zjNEg==",
-			"dev": true,
 			"requires": {
 				"browserslist": "^3.2.0",
 				"caniuse-lite": "^1.0.30000817",
@@ -1003,20 +908,17 @@
 		"aws-sign2": {
 			"version": "0.7.0",
 			"resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-			"integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
-			"dev": true
+			"integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
 		},
 		"aws4": {
 			"version": "1.7.0",
 			"resolved": "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz",
-			"integrity": "sha512-32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w==",
-			"dev": true
+			"integrity": "sha512-32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w=="
 		},
 		"axobject-query": {
 			"version": "0.1.0",
 			"resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-0.1.0.tgz",
 			"integrity": "sha1-YvWdvFnJ+SQnWco0mWDnov48NsA=",
-			"dev": true,
 			"requires": {
 				"ast-types-flow": "0.0.7"
 			}
@@ -1025,7 +927,6 @@
 			"version": "6.26.0",
 			"resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
 			"integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
-			"dev": true,
 			"requires": {
 				"chalk": "^1.1.3",
 				"esutils": "^2.0.2",
@@ -1035,14 +936,12 @@
 				"ansi-styles": {
 					"version": "2.2.1",
 					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-					"dev": true
+					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
 				},
 				"chalk": {
 					"version": "1.1.3",
 					"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
 					"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-					"dev": true,
 					"requires": {
 						"ansi-styles": "^2.2.1",
 						"escape-string-regexp": "^1.0.2",
@@ -1054,8 +953,7 @@
 				"supports-color": {
 					"version": "2.0.0",
 					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-					"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-					"dev": true
+					"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
 				}
 			}
 		},
@@ -1063,7 +961,6 @@
 			"version": "6.26.0",
 			"resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.0.tgz",
 			"integrity": "sha1-rzL3izGm/O8RnIew/Y2XU/A6C7g=",
-			"dev": true,
 			"requires": {
 				"babel-code-frame": "^6.26.0",
 				"babel-generator": "^6.26.0",
@@ -1089,8 +986,7 @@
 				"source-map": {
 					"version": "0.5.7",
 					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-					"dev": true
+					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
 				}
 			}
 		},
@@ -1098,7 +994,6 @@
 			"version": "8.0.3",
 			"resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-8.0.3.tgz",
 			"integrity": "sha512-7D4iUpylEiKJPGbeSAlNddGcmA41PadgZ6UAb6JVyh003h3d0EbZusYFBR/+nBgqtaVJM2J2zUVa3N0hrpMH6g==",
-			"dev": true,
 			"requires": {
 				"@babel/code-frame": "7.0.0-beta.31",
 				"@babel/traverse": "7.0.0-beta.31",
@@ -1110,7 +1005,6 @@
 					"version": "7.0.0-beta.31",
 					"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0-beta.31.tgz",
 					"integrity": "sha512-yd7CkUughvHQoEahQqcMdrZw6o/6PwUxiRkfZuVDVHCDe77mysD/suoNyk5mK6phTnRW1kyIbPHyCJgxw++LXg==",
-					"dev": true,
 					"requires": {
 						"chalk": "^2.0.0",
 						"esutils": "^2.0.2",
@@ -1120,8 +1014,7 @@
 				"babylon": {
 					"version": "7.0.0-beta.31",
 					"resolved": "https://registry.npmjs.org/babylon/-/babylon-7.0.0-beta.31.tgz",
-					"integrity": "sha512-6lm2mV3S51yEnKmQQNnswoABL1U1H1KHoCCVwdwI3hvIv+W7ya4ki7Aw4o4KxtUHjNKkK5WpZb22rrMMOcJXJQ==",
-					"dev": true
+					"integrity": "sha512-6lm2mV3S51yEnKmQQNnswoABL1U1H1KHoCCVwdwI3hvIv+W7ya4ki7Aw4o4KxtUHjNKkK5WpZb22rrMMOcJXJQ=="
 				}
 			}
 		},
@@ -1129,7 +1022,6 @@
 			"version": "6.26.1",
 			"resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz",
 			"integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==",
-			"dev": true,
 			"requires": {
 				"babel-messages": "^6.23.0",
 				"babel-runtime": "^6.26.0",
@@ -1145,7 +1037,6 @@
 					"version": "4.0.0",
 					"resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz",
 					"integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=",
-					"dev": true,
 					"requires": {
 						"repeating": "^2.0.0"
 					}
@@ -1153,14 +1044,12 @@
 				"jsesc": {
 					"version": "1.3.0",
 					"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
-					"integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=",
-					"dev": true
+					"integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s="
 				},
 				"source-map": {
 					"version": "0.5.7",
 					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-					"dev": true
+					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
 				}
 			}
 		},
@@ -1168,7 +1057,6 @@
 			"version": "6.24.1",
 			"resolved": "https://registry.npmjs.org/babel-helper-bindify-decorators/-/babel-helper-bindify-decorators-6.24.1.tgz",
 			"integrity": "sha1-FMGeXxQte0fxmlJDHlKxzLxAozA=",
-			"dev": true,
 			"requires": {
 				"babel-runtime": "^6.22.0",
 				"babel-traverse": "^6.24.1",
@@ -1179,7 +1067,6 @@
 			"version": "6.24.1",
 			"resolved": "https://registry.npmjs.org/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz",
 			"integrity": "sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=",
-			"dev": true,
 			"requires": {
 				"babel-helper-explode-assignable-expression": "^6.24.1",
 				"babel-runtime": "^6.22.0",
@@ -1190,7 +1077,6 @@
 			"version": "6.26.0",
 			"resolved": "https://registry.npmjs.org/babel-helper-builder-react-jsx/-/babel-helper-builder-react-jsx-6.26.0.tgz",
 			"integrity": "sha1-Of+DE7dci2Xc7/HzHTg+D/KkCKA=",
-			"dev": true,
 			"requires": {
 				"babel-runtime": "^6.26.0",
 				"babel-types": "^6.26.0",
@@ -1201,7 +1087,6 @@
 			"version": "6.24.1",
 			"resolved": "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz",
 			"integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=",
-			"dev": true,
 			"requires": {
 				"babel-helper-hoist-variables": "^6.24.1",
 				"babel-runtime": "^6.22.0",
@@ -1213,7 +1098,6 @@
 			"version": "6.26.0",
 			"resolved": "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz",
 			"integrity": "sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8=",
-			"dev": true,
 			"requires": {
 				"babel-helper-function-name": "^6.24.1",
 				"babel-runtime": "^6.26.0",
@@ -1225,7 +1109,6 @@
 			"version": "6.24.1",
 			"resolved": "https://registry.npmjs.org/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz",
 			"integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=",
-			"dev": true,
 			"requires": {
 				"babel-runtime": "^6.22.0",
 				"babel-traverse": "^6.24.1",
@@ -1236,7 +1119,6 @@
 			"version": "6.24.1",
 			"resolved": "https://registry.npmjs.org/babel-helper-explode-class/-/babel-helper-explode-class-6.24.1.tgz",
 			"integrity": "sha1-fcKjkQ3uAHBW4eMdZAztPVTqqes=",
-			"dev": true,
 			"requires": {
 				"babel-helper-bindify-decorators": "^6.24.1",
 				"babel-runtime": "^6.22.0",
@@ -1248,7 +1130,6 @@
 			"version": "6.24.1",
 			"resolved": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz",
 			"integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=",
-			"dev": true,
 			"requires": {
 				"babel-helper-get-function-arity": "^6.24.1",
 				"babel-runtime": "^6.22.0",
@@ -1261,7 +1142,6 @@
 			"version": "6.24.1",
 			"resolved": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz",
 			"integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=",
-			"dev": true,
 			"requires": {
 				"babel-runtime": "^6.22.0",
 				"babel-types": "^6.24.1"
@@ -1271,7 +1151,6 @@
 			"version": "6.24.1",
 			"resolved": "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz",
 			"integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=",
-			"dev": true,
 			"requires": {
 				"babel-runtime": "^6.22.0",
 				"babel-types": "^6.24.1"
@@ -1281,7 +1160,6 @@
 			"version": "6.24.1",
 			"resolved": "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz",
 			"integrity": "sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=",
-			"dev": true,
 			"requires": {
 				"babel-runtime": "^6.22.0",
 				"babel-types": "^6.24.1"
@@ -1291,7 +1169,6 @@
 			"version": "6.26.0",
 			"resolved": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz",
 			"integrity": "sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=",
-			"dev": true,
 			"requires": {
 				"babel-runtime": "^6.26.0",
 				"babel-types": "^6.26.0",
@@ -1302,7 +1179,6 @@
 			"version": "6.24.1",
 			"resolved": "https://registry.npmjs.org/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz",
 			"integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=",
-			"dev": true,
 			"requires": {
 				"babel-helper-function-name": "^6.24.1",
 				"babel-runtime": "^6.22.0",
@@ -1315,7 +1191,6 @@
 			"version": "6.24.1",
 			"resolved": "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz",
 			"integrity": "sha1-v22/5Dk40XNpohPKiov3S2qQqxo=",
-			"dev": true,
 			"requires": {
 				"babel-helper-optimise-call-expression": "^6.24.1",
 				"babel-messages": "^6.23.0",
@@ -1329,7 +1204,6 @@
 			"version": "6.24.1",
 			"resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz",
 			"integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=",
-			"dev": true,
 			"requires": {
 				"babel-runtime": "^6.22.0",
 				"babel-template": "^6.24.1"
@@ -1339,7 +1213,6 @@
 			"version": "22.4.4",
 			"resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-22.4.4.tgz",
 			"integrity": "sha512-A9NB6/lZhYyypR9ATryOSDcqBaqNdzq4U+CN+/wcMsLcmKkPxQEoTKLajGfd3IkxNyVBT8NewUK2nWyGbSzHEQ==",
-			"dev": true,
 			"requires": {
 				"babel-plugin-istanbul": "^4.1.5",
 				"babel-preset-jest": "^22.4.4"
@@ -1349,7 +1222,6 @@
 			"version": "7.1.4",
 			"resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-7.1.4.tgz",
 			"integrity": "sha512-/hbyEvPzBJuGpk9o80R0ZyTej6heEOr59GoEUtn8qFKbnx4cJm9FWES6J/iv644sYgrtVw9JJQkjaLW/bqb5gw==",
-			"dev": true,
 			"requires": {
 				"find-cache-dir": "^1.0.0",
 				"loader-utils": "^1.0.2",
@@ -1360,7 +1232,6 @@
 			"version": "6.23.0",
 			"resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
 			"integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
-			"dev": true,
 			"requires": {
 				"babel-runtime": "^6.22.0"
 			}
@@ -1369,7 +1240,6 @@
 			"version": "6.22.0",
 			"resolved": "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz",
 			"integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=",
-			"dev": true,
 			"requires": {
 				"babel-runtime": "^6.22.0"
 			}
@@ -1378,7 +1248,6 @@
 			"version": "4.1.6",
 			"resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.6.tgz",
 			"integrity": "sha512-PWP9FQ1AhZhS01T/4qLSKoHGY/xvkZdVBGlKM/HuxxS3+sC66HhTNR7+MpbO/so/cz/wY94MeSWJuP1hXIPfwQ==",
-			"dev": true,
 			"requires": {
 				"babel-plugin-syntax-object-rest-spread": "^6.13.0",
 				"find-up": "^2.1.0",
@@ -1389,86 +1258,72 @@
 		"babel-plugin-jest-hoist": {
 			"version": "22.4.4",
 			"resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-22.4.4.tgz",
-			"integrity": "sha512-DUvGfYaAIlkdnygVIEl0O4Av69NtuQWcrjMOv6DODPuhuGLDnbsARz3AwiiI/EkIMMlxQDUcrZ9yoyJvTNjcVQ==",
-			"dev": true
+			"integrity": "sha512-DUvGfYaAIlkdnygVIEl0O4Av69NtuQWcrjMOv6DODPuhuGLDnbsARz3AwiiI/EkIMMlxQDUcrZ9yoyJvTNjcVQ=="
 		},
 		"babel-plugin-syntax-async-functions": {
 			"version": "6.13.0",
 			"resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz",
-			"integrity": "sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU=",
-			"dev": true
+			"integrity": "sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU="
 		},
 		"babel-plugin-syntax-async-generators": {
 			"version": "6.13.0",
 			"resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-generators/-/babel-plugin-syntax-async-generators-6.13.0.tgz",
-			"integrity": "sha1-a8lj67FuzLrmuStZbrfzXDQqi5o=",
-			"dev": true
+			"integrity": "sha1-a8lj67FuzLrmuStZbrfzXDQqi5o="
 		},
 		"babel-plugin-syntax-class-constructor-call": {
 			"version": "6.18.0",
 			"resolved": "https://registry.npmjs.org/babel-plugin-syntax-class-constructor-call/-/babel-plugin-syntax-class-constructor-call-6.18.0.tgz",
-			"integrity": "sha1-nLnTn+Q8hgC+yBRkVt3L1OGnZBY=",
-			"dev": true
+			"integrity": "sha1-nLnTn+Q8hgC+yBRkVt3L1OGnZBY="
 		},
 		"babel-plugin-syntax-class-properties": {
 			"version": "6.13.0",
 			"resolved": "https://registry.npmjs.org/babel-plugin-syntax-class-properties/-/babel-plugin-syntax-class-properties-6.13.0.tgz",
-			"integrity": "sha1-1+sjt5oxf4VDlixQW4J8fWysJ94=",
-			"dev": true
+			"integrity": "sha1-1+sjt5oxf4VDlixQW4J8fWysJ94="
 		},
 		"babel-plugin-syntax-decorators": {
 			"version": "6.13.0",
 			"resolved": "https://registry.npmjs.org/babel-plugin-syntax-decorators/-/babel-plugin-syntax-decorators-6.13.0.tgz",
-			"integrity": "sha1-MSVjtNvePMgGzuPkFszurd0RrAs=",
-			"dev": true
+			"integrity": "sha1-MSVjtNvePMgGzuPkFszurd0RrAs="
 		},
 		"babel-plugin-syntax-dynamic-import": {
 			"version": "6.18.0",
 			"resolved": "https://registry.npmjs.org/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz",
-			"integrity": "sha1-jWomIpyDdFqZgqRBBRVyyqF5sdo=",
-			"dev": true
+			"integrity": "sha1-jWomIpyDdFqZgqRBBRVyyqF5sdo="
 		},
 		"babel-plugin-syntax-exponentiation-operator": {
 			"version": "6.13.0",
 			"resolved": "https://registry.npmjs.org/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz",
-			"integrity": "sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4=",
-			"dev": true
+			"integrity": "sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4="
 		},
 		"babel-plugin-syntax-export-extensions": {
 			"version": "6.13.0",
 			"resolved": "https://registry.npmjs.org/babel-plugin-syntax-export-extensions/-/babel-plugin-syntax-export-extensions-6.13.0.tgz",
-			"integrity": "sha1-cKFITw+QiaToStRLrDU8lbmxJyE=",
-			"dev": true
+			"integrity": "sha1-cKFITw+QiaToStRLrDU8lbmxJyE="
 		},
 		"babel-plugin-syntax-flow": {
 			"version": "6.18.0",
 			"resolved": "https://registry.npmjs.org/babel-plugin-syntax-flow/-/babel-plugin-syntax-flow-6.18.0.tgz",
-			"integrity": "sha1-TDqyCiryaqIM0lmVw5jE63AxDI0=",
-			"dev": true
+			"integrity": "sha1-TDqyCiryaqIM0lmVw5jE63AxDI0="
 		},
 		"babel-plugin-syntax-jsx": {
 			"version": "6.18.0",
 			"resolved": "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz",
-			"integrity": "sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY=",
-			"dev": true
+			"integrity": "sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY="
 		},
 		"babel-plugin-syntax-object-rest-spread": {
 			"version": "6.13.0",
 			"resolved": "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz",
-			"integrity": "sha1-/WU28rzhODb/o6VFjEkDpZe7O/U=",
-			"dev": true
+			"integrity": "sha1-/WU28rzhODb/o6VFjEkDpZe7O/U="
 		},
 		"babel-plugin-syntax-trailing-function-commas": {
 			"version": "6.22.0",
 			"resolved": "https://registry.npmjs.org/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz",
-			"integrity": "sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM=",
-			"dev": true
+			"integrity": "sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM="
 		},
 		"babel-plugin-transform-async-generator-functions": {
 			"version": "6.24.1",
 			"resolved": "https://registry.npmjs.org/babel-plugin-transform-async-generator-functions/-/babel-plugin-transform-async-generator-functions-6.24.1.tgz",
 			"integrity": "sha1-8FiQAUX9PpkHpt3yjaWfIVJYpds=",
-			"dev": true,
 			"requires": {
 				"babel-helper-remap-async-to-generator": "^6.24.1",
 				"babel-plugin-syntax-async-generators": "^6.5.0",
@@ -1479,7 +1334,6 @@
 			"version": "6.24.1",
 			"resolved": "https://registry.npmjs.org/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz",
 			"integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=",
-			"dev": true,
 			"requires": {
 				"babel-helper-remap-async-to-generator": "^6.24.1",
 				"babel-plugin-syntax-async-functions": "^6.8.0",
@@ -1490,7 +1344,6 @@
 			"version": "6.24.1",
 			"resolved": "https://registry.npmjs.org/babel-plugin-transform-class-constructor-call/-/babel-plugin-transform-class-constructor-call-6.24.1.tgz",
 			"integrity": "sha1-gNwoVQWsBn3LjWxl4vbxGrd2Xvk=",
-			"dev": true,
 			"requires": {
 				"babel-plugin-syntax-class-constructor-call": "^6.18.0",
 				"babel-runtime": "^6.22.0",
@@ -1501,7 +1354,6 @@
 			"version": "6.24.1",
 			"resolved": "https://registry.npmjs.org/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.24.1.tgz",
 			"integrity": "sha1-anl2PqYdM9NvN7YRqp3vgagbRqw=",
-			"dev": true,
 			"requires": {
 				"babel-helper-function-name": "^6.24.1",
 				"babel-plugin-syntax-class-properties": "^6.8.0",
@@ -1513,7 +1365,6 @@
 			"version": "6.24.1",
 			"resolved": "https://registry.npmjs.org/babel-plugin-transform-decorators/-/babel-plugin-transform-decorators-6.24.1.tgz",
 			"integrity": "sha1-eIAT2PjGtSIr33s0Q5Df13Vp4k0=",
-			"dev": true,
 			"requires": {
 				"babel-helper-explode-class": "^6.24.1",
 				"babel-plugin-syntax-decorators": "^6.13.0",
@@ -1526,7 +1377,6 @@
 			"version": "6.22.0",
 			"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz",
 			"integrity": "sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=",
-			"dev": true,
 			"requires": {
 				"babel-runtime": "^6.22.0"
 			}
@@ -1535,7 +1385,6 @@
 			"version": "6.22.0",
 			"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz",
 			"integrity": "sha1-u8UbSflk1wy42OC5ToICRs46YUE=",
-			"dev": true,
 			"requires": {
 				"babel-runtime": "^6.22.0"
 			}
@@ -1544,7 +1393,6 @@
 			"version": "6.26.0",
 			"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz",
 			"integrity": "sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8=",
-			"dev": true,
 			"requires": {
 				"babel-runtime": "^6.26.0",
 				"babel-template": "^6.26.0",
@@ -1557,7 +1405,6 @@
 			"version": "6.24.1",
 			"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz",
 			"integrity": "sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=",
-			"dev": true,
 			"requires": {
 				"babel-helper-define-map": "^6.24.1",
 				"babel-helper-function-name": "^6.24.1",
@@ -1574,7 +1421,6 @@
 			"version": "6.24.1",
 			"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz",
 			"integrity": "sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=",
-			"dev": true,
 			"requires": {
 				"babel-runtime": "^6.22.0",
 				"babel-template": "^6.24.1"
@@ -1584,7 +1430,6 @@
 			"version": "6.23.0",
 			"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz",
 			"integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=",
-			"dev": true,
 			"requires": {
 				"babel-runtime": "^6.22.0"
 			}
@@ -1593,7 +1438,6 @@
 			"version": "6.24.1",
 			"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz",
 			"integrity": "sha1-c+s9MQypaePvnskcU3QabxV2Qj4=",
-			"dev": true,
 			"requires": {
 				"babel-runtime": "^6.22.0",
 				"babel-types": "^6.24.1"
@@ -1603,7 +1447,6 @@
 			"version": "6.23.0",
 			"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz",
 			"integrity": "sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=",
-			"dev": true,
 			"requires": {
 				"babel-runtime": "^6.22.0"
 			}
@@ -1612,7 +1455,6 @@
 			"version": "6.24.1",
 			"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz",
 			"integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=",
-			"dev": true,
 			"requires": {
 				"babel-helper-function-name": "^6.24.1",
 				"babel-runtime": "^6.22.0",
@@ -1623,7 +1465,6 @@
 			"version": "6.22.0",
 			"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz",
 			"integrity": "sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=",
-			"dev": true,
 			"requires": {
 				"babel-runtime": "^6.22.0"
 			}
@@ -1632,7 +1473,6 @@
 			"version": "6.24.1",
 			"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz",
 			"integrity": "sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ=",
-			"dev": true,
 			"requires": {
 				"babel-plugin-transform-es2015-modules-commonjs": "^6.24.1",
 				"babel-runtime": "^6.22.0",
@@ -1643,7 +1483,6 @@
 			"version": "6.26.2",
 			"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.2.tgz",
 			"integrity": "sha512-CV9ROOHEdrjcwhIaJNBGMBCodN+1cfkwtM1SbUHmvyy35KGT7fohbpOxkE2uLz1o6odKK2Ck/tz47z+VqQfi9Q==",
-			"dev": true,
 			"requires": {
 				"babel-plugin-transform-strict-mode": "^6.24.1",
 				"babel-runtime": "^6.26.0",
@@ -1655,7 +1494,6 @@
 			"version": "6.24.1",
 			"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz",
 			"integrity": "sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM=",
-			"dev": true,
 			"requires": {
 				"babel-helper-hoist-variables": "^6.24.1",
 				"babel-runtime": "^6.22.0",
@@ -1666,7 +1504,6 @@
 			"version": "6.24.1",
 			"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz",
 			"integrity": "sha1-rJl+YoXNGO1hdq22B9YCNErThGg=",
-			"dev": true,
 			"requires": {
 				"babel-plugin-transform-es2015-modules-amd": "^6.24.1",
 				"babel-runtime": "^6.22.0",
@@ -1677,7 +1514,6 @@
 			"version": "6.24.1",
 			"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz",
 			"integrity": "sha1-JM72muIcuDp/hgPa0CH1cusnj40=",
-			"dev": true,
 			"requires": {
 				"babel-helper-replace-supers": "^6.24.1",
 				"babel-runtime": "^6.22.0"
@@ -1687,7 +1523,6 @@
 			"version": "6.24.1",
 			"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz",
 			"integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=",
-			"dev": true,
 			"requires": {
 				"babel-helper-call-delegate": "^6.24.1",
 				"babel-helper-get-function-arity": "^6.24.1",
@@ -1701,7 +1536,6 @@
 			"version": "6.24.1",
 			"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz",
 			"integrity": "sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=",
-			"dev": true,
 			"requires": {
 				"babel-runtime": "^6.22.0",
 				"babel-types": "^6.24.1"
@@ -1711,7 +1545,6 @@
 			"version": "6.22.0",
 			"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz",
 			"integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=",
-			"dev": true,
 			"requires": {
 				"babel-runtime": "^6.22.0"
 			}
@@ -1720,7 +1553,6 @@
 			"version": "6.24.1",
 			"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz",
 			"integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=",
-			"dev": true,
 			"requires": {
 				"babel-helper-regex": "^6.24.1",
 				"babel-runtime": "^6.22.0",
@@ -1731,7 +1563,6 @@
 			"version": "6.22.0",
 			"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz",
 			"integrity": "sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=",
-			"dev": true,
 			"requires": {
 				"babel-runtime": "^6.22.0"
 			}
@@ -1740,7 +1571,6 @@
 			"version": "6.23.0",
 			"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz",
 			"integrity": "sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=",
-			"dev": true,
 			"requires": {
 				"babel-runtime": "^6.22.0"
 			}
@@ -1749,7 +1579,6 @@
 			"version": "6.24.1",
 			"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz",
 			"integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=",
-			"dev": true,
 			"requires": {
 				"babel-helper-regex": "^6.24.1",
 				"babel-runtime": "^6.22.0",
@@ -1760,7 +1589,6 @@
 			"version": "6.24.1",
 			"resolved": "https://registry.npmjs.org/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz",
 			"integrity": "sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=",
-			"dev": true,
 			"requires": {
 				"babel-helper-builder-binary-assignment-operator-visitor": "^6.24.1",
 				"babel-plugin-syntax-exponentiation-operator": "^6.8.0",
@@ -1771,7 +1599,6 @@
 			"version": "6.22.0",
 			"resolved": "https://registry.npmjs.org/babel-plugin-transform-export-extensions/-/babel-plugin-transform-export-extensions-6.22.0.tgz",
 			"integrity": "sha1-U3OLR+deghhYnuqUbLvTkQm75lM=",
-			"dev": true,
 			"requires": {
 				"babel-plugin-syntax-export-extensions": "^6.8.0",
 				"babel-runtime": "^6.22.0"
@@ -1781,7 +1608,6 @@
 			"version": "6.22.0",
 			"resolved": "https://registry.npmjs.org/babel-plugin-transform-flow-strip-types/-/babel-plugin-transform-flow-strip-types-6.22.0.tgz",
 			"integrity": "sha1-hMtnKTXUNxT9wyvOhFaNh0Qc988=",
-			"dev": true,
 			"requires": {
 				"babel-plugin-syntax-flow": "^6.18.0",
 				"babel-runtime": "^6.22.0"
@@ -1791,7 +1617,6 @@
 			"version": "6.26.0",
 			"resolved": "https://registry.npmjs.org/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz",
 			"integrity": "sha1-DzZpLVD+9rfi1LOsFHgTepY7ewY=",
-			"dev": true,
 			"requires": {
 				"babel-plugin-syntax-object-rest-spread": "^6.8.0",
 				"babel-runtime": "^6.26.0"
@@ -1801,7 +1626,6 @@
 			"version": "6.24.1",
 			"resolved": "https://registry.npmjs.org/babel-plugin-transform-react-jsx/-/babel-plugin-transform-react-jsx-6.24.1.tgz",
 			"integrity": "sha1-hAoCjn30YN/DotKfDA2R9jduZqM=",
-			"dev": true,
 			"requires": {
 				"babel-helper-builder-react-jsx": "^6.24.1",
 				"babel-plugin-syntax-jsx": "^6.8.0",
@@ -1812,7 +1636,6 @@
 			"version": "6.26.0",
 			"resolved": "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz",
 			"integrity": "sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8=",
-			"dev": true,
 			"requires": {
 				"regenerator-transform": "^0.10.0"
 			}
@@ -1821,7 +1644,6 @@
 			"version": "6.23.0",
 			"resolved": "https://registry.npmjs.org/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.23.0.tgz",
 			"integrity": "sha1-iEkNRGUC6puOfvsP4J7E2ZR5se4=",
-			"dev": true,
 			"requires": {
 				"babel-runtime": "^6.22.0"
 			}
@@ -1830,7 +1652,6 @@
 			"version": "6.24.1",
 			"resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz",
 			"integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=",
-			"dev": true,
 			"requires": {
 				"babel-runtime": "^6.22.0",
 				"babel-types": "^6.24.1"
@@ -1840,7 +1661,6 @@
 			"version": "1.7.0",
 			"resolved": "https://registry.npmjs.org/babel-preset-env/-/babel-preset-env-1.7.0.tgz",
 			"integrity": "sha512-9OR2afuKDneX2/q2EurSftUYM0xGu4O2D9adAhVfADDhrYDaxXV0rBbevVYoY9n6nyX1PmQW/0jtpJvUNr9CHg==",
-			"dev": true,
 			"requires": {
 				"babel-plugin-check-es2015-constants": "^6.22.0",
 				"babel-plugin-syntax-trailing-function-commas": "^6.22.0",
@@ -1878,7 +1698,6 @@
 			"version": "6.24.1",
 			"resolved": "https://registry.npmjs.org/babel-preset-es2015/-/babel-preset-es2015-6.24.1.tgz",
 			"integrity": "sha1-1EBQ1rwsn+6nAqrzjXJ6AhBTiTk=",
-			"dev": true,
 			"requires": {
 				"babel-plugin-check-es2015-constants": "^6.22.0",
 				"babel-plugin-transform-es2015-arrow-functions": "^6.22.0",
@@ -1910,7 +1729,6 @@
 			"version": "22.4.4",
 			"resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-22.4.4.tgz",
 			"integrity": "sha512-+dxMtOFwnSYWfum0NaEc0O03oSdwBsjx4tMSChRDPGwu/4wSY6Q6ANW3wkjKpJzzguaovRs/DODcT4hbSN8yiA==",
-			"dev": true,
 			"requires": {
 				"babel-plugin-jest-hoist": "^22.4.4",
 				"babel-plugin-syntax-object-rest-spread": "^6.13.0"
@@ -1920,7 +1738,6 @@
 			"version": "6.24.1",
 			"resolved": "https://registry.npmjs.org/babel-preset-stage-1/-/babel-preset-stage-1-6.24.1.tgz",
 			"integrity": "sha1-dpLNfc1oSZB+auSgqFWJz7niv7A=",
-			"dev": true,
 			"requires": {
 				"babel-plugin-transform-class-constructor-call": "^6.24.1",
 				"babel-plugin-transform-export-extensions": "^6.22.0",
@@ -1931,7 +1748,6 @@
 			"version": "6.24.1",
 			"resolved": "https://registry.npmjs.org/babel-preset-stage-2/-/babel-preset-stage-2-6.24.1.tgz",
 			"integrity": "sha1-2eKWD7PXEYfw5k7sYrwHdnIZvcE=",
-			"dev": true,
 			"requires": {
 				"babel-plugin-syntax-dynamic-import": "^6.18.0",
 				"babel-plugin-transform-class-properties": "^6.24.1",
@@ -1943,7 +1759,6 @@
 			"version": "6.24.1",
 			"resolved": "https://registry.npmjs.org/babel-preset-stage-3/-/babel-preset-stage-3-6.24.1.tgz",
 			"integrity": "sha1-g2raCp56f6N8sTj7kyb4eTSkg5U=",
-			"dev": true,
 			"requires": {
 				"babel-plugin-syntax-trailing-function-commas": "^6.22.0",
 				"babel-plugin-transform-async-generator-functions": "^6.24.1",
@@ -1956,7 +1771,6 @@
 			"version": "6.26.0",
 			"resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz",
 			"integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=",
-			"dev": true,
 			"requires": {
 				"babel-core": "^6.26.0",
 				"babel-runtime": "^6.26.0",
@@ -1970,14 +1784,12 @@
 				"source-map": {
 					"version": "0.5.7",
 					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-					"dev": true
+					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
 				},
 				"source-map-support": {
 					"version": "0.4.18",
 					"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz",
 					"integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
-					"dev": true,
 					"requires": {
 						"source-map": "^0.5.6"
 					}
@@ -1988,7 +1800,6 @@
 			"version": "6.26.0",
 			"resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
 			"integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
-			"dev": true,
 			"requires": {
 				"core-js": "^2.4.0",
 				"regenerator-runtime": "^0.11.0"
@@ -1998,7 +1809,6 @@
 			"version": "6.26.0",
 			"resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
 			"integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
-			"dev": true,
 			"requires": {
 				"babel-runtime": "^6.26.0",
 				"babel-traverse": "^6.26.0",
@@ -2011,7 +1821,6 @@
 			"version": "6.26.0",
 			"resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
 			"integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
-			"dev": true,
 			"requires": {
 				"babel-code-frame": "^6.26.0",
 				"babel-messages": "^6.23.0",
@@ -2028,7 +1837,6 @@
 			"version": "6.26.0",
 			"resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
 			"integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
-			"dev": true,
 			"requires": {
 				"babel-runtime": "^6.26.0",
 				"esutils": "^2.0.2",
@@ -2039,8 +1847,7 @@
 		"babylon": {
 			"version": "6.18.0",
 			"resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
-			"integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
-			"dev": true
+			"integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ=="
 		},
 		"balanced-match": {
 			"version": "1.0.0",
@@ -2051,7 +1858,6 @@
 			"version": "0.11.2",
 			"resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
 			"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-			"dev": true,
 			"requires": {
 				"cache-base": "^1.0.1",
 				"class-utils": "^0.3.5",
@@ -2066,7 +1872,6 @@
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
 					"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-					"dev": true,
 					"requires": {
 						"is-descriptor": "^1.0.0"
 					}
@@ -2075,7 +1880,6 @@
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
 					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-					"dev": true,
 					"requires": {
 						"kind-of": "^6.0.0"
 					}
@@ -2084,7 +1888,6 @@
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
 					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-					"dev": true,
 					"requires": {
 						"kind-of": "^6.0.0"
 					}
@@ -2093,7 +1896,6 @@
 					"version": "1.0.2",
 					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
 					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-					"dev": true,
 					"requires": {
 						"is-accessor-descriptor": "^1.0.0",
 						"is-data-descriptor": "^1.0.0",
@@ -2103,22 +1905,19 @@
 				"kind-of": {
 					"version": "6.0.2",
 					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-					"dev": true
+					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
 				}
 			}
 		},
 		"base64-js": {
 			"version": "1.3.0",
 			"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz",
-			"integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==",
-			"dev": true
+			"integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw=="
 		},
 		"bcrypt-pbkdf": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
 			"integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
-			"dev": true,
 			"optional": true,
 			"requires": {
 				"tweetnacl": "^0.14.3"
@@ -2127,26 +1926,22 @@
 		"big.js": {
 			"version": "3.2.0",
 			"resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz",
-			"integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==",
-			"dev": true
+			"integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q=="
 		},
 		"binary-extensions": {
 			"version": "1.11.0",
 			"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.11.0.tgz",
-			"integrity": "sha1-RqoXUftqL5PuXmibsQh9SxTGwgU=",
-			"dev": true
+			"integrity": "sha1-RqoXUftqL5PuXmibsQh9SxTGwgU="
 		},
 		"binaryextensions": {
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/binaryextensions/-/binaryextensions-2.1.1.tgz",
-			"integrity": "sha512-XBaoWE9RW8pPdPQNibZsW2zh8TW6gcarXp1FZPwT8Uop8ScSNldJEWf2k9l3HeTqdrEwsOsFcq74RiJECW34yA==",
-			"dev": true
+			"integrity": "sha512-XBaoWE9RW8pPdPQNibZsW2zh8TW6gcarXp1FZPwT8Uop8ScSNldJEWf2k9l3HeTqdrEwsOsFcq74RiJECW34yA=="
 		},
 		"block-stream": {
 			"version": "0.0.9",
 			"resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
 			"integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
-			"dev": true,
 			"requires": {
 				"inherits": "~2.0.0"
 			}
@@ -2159,14 +1954,12 @@
 		"bn.js": {
 			"version": "4.11.8",
 			"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
-			"integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
-			"dev": true
+			"integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA=="
 		},
 		"body": {
 			"version": "5.1.0",
 			"resolved": "https://registry.npmjs.org/body/-/body-5.1.0.tgz",
 			"integrity": "sha1-5LoM5BCkaTYyM2dgnstOZVMSUGk=",
-			"dev": true,
 			"requires": {
 				"continuable-cache": "^0.3.1",
 				"error": "^7.0.0",
@@ -2177,14 +1970,12 @@
 		"boolbase": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
-			"integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
-			"dev": true
+			"integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24="
 		},
 		"boom": {
 			"version": "4.3.1",
 			"resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz",
 			"integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=",
-			"dev": true,
 			"requires": {
 				"hoek": "4.x.x"
 			}
@@ -2202,7 +1993,6 @@
 			"version": "2.3.2",
 			"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
 			"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-			"dev": true,
 			"requires": {
 				"arr-flatten": "^1.1.0",
 				"array-unique": "^0.3.2",
@@ -2220,7 +2010,6 @@
 					"version": "2.0.1",
 					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
 					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-					"dev": true,
 					"requires": {
 						"is-extendable": "^0.1.0"
 					}
@@ -2230,20 +2019,17 @@
 		"brorand": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
-			"integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
-			"dev": true
+			"integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8="
 		},
 		"browser-process-hrtime": {
 			"version": "0.1.2",
 			"resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-0.1.2.tgz",
-			"integrity": "sha1-Ql1opY00R/AqBKqJQYf86K+Le44=",
-			"dev": true
+			"integrity": "sha1-Ql1opY00R/AqBKqJQYf86K+Le44="
 		},
 		"browser-resolve": {
 			"version": "1.11.2",
 			"resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.2.tgz",
 			"integrity": "sha1-j/CbCixCFxihBRwmCzLkj0QpOM4=",
-			"dev": true,
 			"requires": {
 				"resolve": "1.1.7"
 			},
@@ -2251,8 +2037,7 @@
 				"resolve": {
 					"version": "1.1.7",
 					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
-					"integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=",
-					"dev": true
+					"integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs="
 				}
 			}
 		},
@@ -2260,7 +2045,6 @@
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
 			"integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
-			"dev": true,
 			"requires": {
 				"buffer-xor": "^1.0.3",
 				"cipher-base": "^1.0.0",
@@ -2274,7 +2058,6 @@
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
 			"integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
-			"dev": true,
 			"requires": {
 				"browserify-aes": "^1.0.4",
 				"browserify-des": "^1.0.0",
@@ -2285,7 +2068,6 @@
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.1.tgz",
 			"integrity": "sha512-zy0Cobe3hhgpiOM32Tj7KQ3Vl91m0njwsjzZQK1L+JDf11dzP9qIvjreVinsvXrgfjhStXwUWAEpB9D7Gwmayw==",
-			"dev": true,
 			"requires": {
 				"cipher-base": "^1.0.1",
 				"des.js": "^1.0.0",
@@ -2296,7 +2078,6 @@
 			"version": "4.0.1",
 			"resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
 			"integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
-			"dev": true,
 			"requires": {
 				"bn.js": "^4.1.0",
 				"randombytes": "^2.0.1"
@@ -2306,7 +2087,6 @@
 			"version": "4.0.4",
 			"resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz",
 			"integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=",
-			"dev": true,
 			"requires": {
 				"bn.js": "^4.1.1",
 				"browserify-rsa": "^4.0.0",
@@ -2321,7 +2101,6 @@
 			"version": "0.2.0",
 			"resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
 			"integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
-			"dev": true,
 			"requires": {
 				"pako": "~1.0.5"
 			}
@@ -2330,7 +2109,6 @@
 			"version": "3.2.7",
 			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-3.2.7.tgz",
 			"integrity": "sha512-oYVLxFVqpX9uMhOIQBLtZL+CX4uY8ZpWcjNTaxyWl5rO8yA9SSNikFnAfvk8J3P/7z3BZwNmEqFKaJoYltj3MQ==",
-			"dev": true,
 			"requires": {
 				"caniuse-lite": "^1.0.30000835",
 				"electron-to-chromium": "^1.3.45"
@@ -2340,7 +2118,6 @@
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/bser/-/bser-2.0.0.tgz",
 			"integrity": "sha1-mseNPtXZFYBP2HrLFYvHlxR6Fxk=",
-			"dev": true,
 			"requires": {
 				"node-int64": "^0.4.0"
 			}
@@ -2349,7 +2126,6 @@
 			"version": "4.9.1",
 			"resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
 			"integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
-			"dev": true,
 			"requires": {
 				"base64-js": "^1.0.2",
 				"ieee754": "^1.1.4",
@@ -2364,8 +2140,7 @@
 		"buffer-xor": {
 			"version": "1.0.3",
 			"resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
-			"integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
-			"dev": true
+			"integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk="
 		},
 		"builtin-modules": {
 			"version": "1.1.1",
@@ -2375,8 +2150,7 @@
 		"builtin-status-codes": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
-			"integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
-			"dev": true
+			"integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug="
 		},
 		"byline": {
 			"version": "5.0.0",
@@ -2386,14 +2160,12 @@
 		"bytes": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz",
-			"integrity": "sha1-NWnt6Lo0MV+rmcPpLLBMciDeH6g=",
-			"dev": true
+			"integrity": "sha1-NWnt6Lo0MV+rmcPpLLBMciDeH6g="
 		},
 		"cacache": {
 			"version": "10.0.4",
 			"resolved": "https://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz",
 			"integrity": "sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==",
-			"dev": true,
 			"requires": {
 				"bluebird": "^3.5.1",
 				"chownr": "^1.0.1",
@@ -2414,7 +2186,6 @@
 					"version": "4.1.3",
 					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz",
 					"integrity": "sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==",
-					"dev": true,
 					"requires": {
 						"pseudomap": "^1.0.2",
 						"yallist": "^2.1.2"
@@ -2423,8 +2194,7 @@
 				"y18n": {
 					"version": "4.0.0",
 					"resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-					"integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
-					"dev": true
+					"integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w=="
 				}
 			}
 		},
@@ -2432,7 +2202,6 @@
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
 			"integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
-			"dev": true,
 			"requires": {
 				"collection-visit": "^1.0.0",
 				"component-emitter": "^1.2.1",
@@ -2449,7 +2218,6 @@
 			"version": "2.1.4",
 			"resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-2.1.4.tgz",
 			"integrity": "sha1-DYCIAbY0KtM8kd+dC0TcCbkeXD0=",
-			"dev": true,
 			"requires": {
 				"clone-response": "1.0.2",
 				"get-stream": "3.0.0",
@@ -2463,22 +2231,19 @@
 				"lowercase-keys": {
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz",
-					"integrity": "sha1-TjNms55/VFfjXxMkvfb4jQv8cwY=",
-					"dev": true
+					"integrity": "sha1-TjNms55/VFfjXxMkvfb4jQv8cwY="
 				}
 			}
 		},
 		"call-me-maybe": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz",
-			"integrity": "sha1-JtII6onje1y95gJQoV8DHBak1ms=",
-			"dev": true
+			"integrity": "sha1-JtII6onje1y95gJQoV8DHBak1ms="
 		},
 		"caller-path": {
 			"version": "0.1.0",
 			"resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz",
 			"integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=",
-			"dev": true,
 			"requires": {
 				"callsites": "^0.2.0"
 			},
@@ -2486,16 +2251,14 @@
 				"callsites": {
 					"version": "0.2.0",
 					"resolved": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz",
-					"integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=",
-					"dev": true
+					"integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo="
 				}
 			}
 		},
 		"callsites": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
-			"integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=",
-			"dev": true
+			"integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA="
 		},
 		"camelcase": {
 			"version": "1.2.1",
@@ -2524,7 +2287,6 @@
 			"version": "1.6.1",
 			"resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-1.6.1.tgz",
 			"integrity": "sha1-tTTnxzTE+B7F++isoq0kNUuWLGw=",
-			"dev": true,
 			"requires": {
 				"browserslist": "^1.3.6",
 				"caniuse-db": "^1.0.30000529",
@@ -2536,7 +2298,6 @@
 					"version": "1.7.7",
 					"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz",
 					"integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
-					"dev": true,
 					"requires": {
 						"caniuse-db": "^1.0.30000639",
 						"electron-to-chromium": "^1.2.7"
@@ -2547,20 +2308,17 @@
 		"caniuse-db": {
 			"version": "1.0.30000843",
 			"resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000843.tgz",
-			"integrity": "sha1-T36FAfVX3JvNN90zrIWQXHZe/sI=",
-			"dev": true
+			"integrity": "sha1-T36FAfVX3JvNN90zrIWQXHZe/sI="
 		},
 		"caniuse-lite": {
 			"version": "1.0.30000843",
 			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000843.tgz",
-			"integrity": "sha512-1ntiW826MhRBmM0CeI7w1cQr16gxwOoM8doJWh3BFalPZoKWdZXs27Bc04xth/3NR1/wNXn9cpP4F92lVenCvg==",
-			"dev": true
+			"integrity": "sha512-1ntiW826MhRBmM0CeI7w1cQr16gxwOoM8doJWh3BFalPZoKWdZXs27Bc04xth/3NR1/wNXn9cpP4F92lVenCvg=="
 		},
 		"capture-exit": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/capture-exit/-/capture-exit-1.2.0.tgz",
 			"integrity": "sha1-HF/MSJ/QqwDU8ax64QcuMXP7q28=",
-			"dev": true,
 			"requires": {
 				"rsvp": "^3.3.3"
 			}
@@ -2573,8 +2331,7 @@
 		"caseless": {
 			"version": "0.12.0",
 			"resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-			"integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
-			"dev": true
+			"integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
 		},
 		"center-align": {
 			"version": "0.1.3",
@@ -2605,7 +2362,6 @@
 			"version": "3.1.1",
 			"resolved": "https://registry.npmjs.org/check-node-version/-/check-node-version-3.1.1.tgz",
 			"integrity": "sha512-52fHDe/0pbidY3InI33Beyb/oarySfLANlXxLGBl9lLVrLIW88XWIwu4jGJrQ1imuWzX5ukNGWXUyCgmgVUD8A==",
-			"dev": true,
 			"requires": {
 				"chalk": "^2.3.0",
 				"map-values": "^1.0.1",
@@ -2619,8 +2375,7 @@
 				"minimist": {
 					"version": "1.2.0",
 					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-					"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-					"dev": true
+					"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
 				}
 			}
 		},
@@ -2628,7 +2383,6 @@
 			"version": "1.0.0-rc.2",
 			"resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.2.tgz",
 			"integrity": "sha1-S59TqBsn5NXawxwP/Qz6A8xoMNs=",
-			"dev": true,
 			"requires": {
 				"css-select": "~1.2.0",
 				"dom-serializer": "~0.1.0",
@@ -2642,7 +2396,6 @@
 			"version": "2.0.3",
 			"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.3.tgz",
 			"integrity": "sha512-zW8iXYZtXMx4kux/nuZVXjkLP+CyIK5Al5FHnj1OgTKGZfp4Oy6/ymtMSKFv3GD8DviEmUPmJg9eFdJ/JzudMg==",
-			"dev": true,
 			"requires": {
 				"anymatch": "^2.0.0",
 				"async-each": "^1.0.0",
@@ -2662,7 +2415,6 @@
 					"version": "4.0.0",
 					"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz",
 					"integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=",
-					"dev": true,
 					"requires": {
 						"is-extglob": "^2.1.1"
 					}
@@ -2672,14 +2424,12 @@
 		"chownr": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz",
-			"integrity": "sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE=",
-			"dev": true
+			"integrity": "sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE="
 		},
 		"chrome-trace-event": {
 			"version": "0.1.3",
 			"resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-0.1.3.tgz",
-			"integrity": "sha512-sjndyZHrrWiu4RY7AkHgjn80GfAM2ZSzUkZLV/Js59Ldmh6JDThf0SUmOHU53rFu2rVxxfCzJ30Ukcfch3Gb/A==",
-			"dev": true
+			"integrity": "sha512-sjndyZHrrWiu4RY7AkHgjn80GfAM2ZSzUkZLV/Js59Ldmh6JDThf0SUmOHU53rFu2rVxxfCzJ30Ukcfch3Gb/A=="
 		},
 		"ci-info": {
 			"version": "1.1.3",
@@ -2690,7 +2440,6 @@
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
 			"integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
-			"dev": true,
 			"requires": {
 				"inherits": "^2.0.1",
 				"safe-buffer": "^5.0.1"
@@ -2699,20 +2448,17 @@
 		"circular-json": {
 			"version": "0.3.3",
 			"resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz",
-			"integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==",
-			"dev": true
+			"integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A=="
 		},
 		"circular-json-es6": {
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/circular-json-es6/-/circular-json-es6-2.0.2.tgz",
-			"integrity": "sha512-ODYONMMNb3p658Zv+Pp+/XPa5s6q7afhz3Tzyvo+VRh9WIrJ64J76ZC4GQxnlye/NesTn09jvOiuE8+xxfpwhQ==",
-			"dev": true
+			"integrity": "sha512-ODYONMMNb3p658Zv+Pp+/XPa5s6q7afhz3Tzyvo+VRh9WIrJ64J76ZC4GQxnlye/NesTn09jvOiuE8+xxfpwhQ=="
 		},
 		"clap": {
 			"version": "1.2.3",
 			"resolved": "https://registry.npmjs.org/clap/-/clap-1.2.3.tgz",
 			"integrity": "sha512-4CoL/A3hf90V3VIEjeuhSvlGFEHKzOz+Wfc2IVZc+FaUgU0ZQafJTP49fvnULipOPcAfqhyI2duwQyns6xqjYA==",
-			"dev": true,
 			"requires": {
 				"chalk": "^1.1.3"
 			},
@@ -2720,14 +2466,12 @@
 				"ansi-styles": {
 					"version": "2.2.1",
 					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-					"dev": true
+					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
 				},
 				"chalk": {
 					"version": "1.1.3",
 					"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
 					"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-					"dev": true,
 					"requires": {
 						"ansi-styles": "^2.2.1",
 						"escape-string-regexp": "^1.0.2",
@@ -2739,8 +2483,7 @@
 				"supports-color": {
 					"version": "2.0.0",
 					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-					"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-					"dev": true
+					"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
 				}
 			}
 		},
@@ -2748,7 +2491,6 @@
 			"version": "0.3.6",
 			"resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
 			"integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
-			"dev": true,
 			"requires": {
 				"arr-union": "^3.1.0",
 				"define-property": "^0.2.5",
@@ -2760,7 +2502,6 @@
 					"version": "0.2.5",
 					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
 					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-					"dev": true,
 					"requires": {
 						"is-descriptor": "^0.1.0"
 					}
@@ -2783,14 +2524,12 @@
 		"cli-spinners": {
 			"version": "0.1.2",
 			"resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-0.1.2.tgz",
-			"integrity": "sha1-u3ZNiOGF+54eaiofGXcjGPYF4xw=",
-			"dev": true
+			"integrity": "sha1-u3ZNiOGF+54eaiofGXcjGPYF4xw="
 		},
 		"cli-table": {
 			"version": "0.3.1",
 			"resolved": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz",
 			"integrity": "sha1-9TsFJmqLGguTSz0IIebi3FkUriM=",
-			"dev": true,
 			"requires": {
 				"colors": "1.0.3"
 			},
@@ -2798,8 +2537,7 @@
 				"colors": {
 					"version": "1.0.3",
 					"resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz",
-					"integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=",
-					"dev": true
+					"integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs="
 				}
 			}
 		},
@@ -2807,7 +2545,6 @@
 			"version": "0.2.1",
 			"resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-0.2.1.tgz",
 			"integrity": "sha1-nxXPuwcFAFNpIWxiasfQWrkN1XQ=",
-			"dev": true,
 			"requires": {
 				"slice-ansi": "0.0.4",
 				"string-width": "^1.0.1"
@@ -2817,7 +2554,6 @@
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
 					"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-					"dev": true,
 					"requires": {
 						"number-is-nan": "^1.0.0"
 					}
@@ -2825,14 +2561,12 @@
 				"slice-ansi": {
 					"version": "0.0.4",
 					"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz",
-					"integrity": "sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU=",
-					"dev": true
+					"integrity": "sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU="
 				},
 				"string-width": {
 					"version": "1.0.2",
 					"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
 					"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-					"dev": true,
 					"requires": {
 						"code-point-at": "^1.0.0",
 						"is-fullwidth-code-point": "^1.0.0",
@@ -2883,14 +2617,12 @@
 		"clone-buffer": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz",
-			"integrity": "sha1-4+JbIHrE5wGvch4staFnksrD3Fg=",
-			"dev": true
+			"integrity": "sha1-4+JbIHrE5wGvch4staFnksrD3Fg="
 		},
 		"clone-deep": {
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-2.0.2.tgz",
 			"integrity": "sha512-SZegPTKjCgpQH63E+eN6mVEEPdQBOUzjyJm5Pora4lrwWRFS8I0QAxV/KD6vV/i0WuijHZWQC1fMsPEdxfdVCQ==",
-			"dev": true,
 			"requires": {
 				"for-own": "^1.0.0",
 				"is-plain-object": "^2.0.4",
@@ -2902,7 +2634,6 @@
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
 					"integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
-					"dev": true,
 					"requires": {
 						"for-in": "^1.0.1"
 					}
@@ -2910,8 +2641,7 @@
 				"kind-of": {
 					"version": "6.0.2",
 					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-					"dev": true
+					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
 				}
 			}
 		},
@@ -2919,7 +2649,6 @@
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz",
 			"integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=",
-			"dev": true,
 			"requires": {
 				"mimic-response": "^1.0.0"
 			}
@@ -2927,14 +2656,12 @@
 		"clone-stats": {
 			"version": "0.0.1",
 			"resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
-			"integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=",
-			"dev": true
+			"integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE="
 		},
 		"cloneable-readable": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.2.tgz",
 			"integrity": "sha512-Bq6+4t+lbM8vhTs/Bef5c5AdEMtapp/iFb6+s4/Hh9MVTt8OLKH7ZOOZSCT+Ys7hsHvqv0GuMPJ1lnQJVHvxpg==",
-			"dev": true,
 			"requires": {
 				"inherits": "^2.0.1",
 				"process-nextick-args": "^2.0.0",
@@ -2953,14 +2680,12 @@
 		"co": {
 			"version": "4.6.0",
 			"resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-			"integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
-			"dev": true
+			"integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ="
 		},
 		"coa": {
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/coa/-/coa-1.0.4.tgz",
 			"integrity": "sha1-qe8VNmDWqGqL3sAomlxoTSF0Mv0=",
-			"dev": true,
 			"requires": {
 				"q": "^1.1.2"
 			}
@@ -2974,7 +2699,6 @@
 			"version": "3.0.2",
 			"resolved": "https://registry.npmjs.org/codecov/-/codecov-3.0.2.tgz",
 			"integrity": "sha512-9ljtIROIjPIUmMRqO+XuDITDoV8xRrZmA0jcEq6p2hg2+wY9wGmLfreAZGIL72IzUfdEDZaU8+Vjidg1fBQ8GQ==",
-			"dev": true,
 			"requires": {
 				"argv": "0.0.2",
 				"request": "^2.81.0",
@@ -2985,7 +2709,6 @@
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
 			"integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
-			"dev": true,
 			"requires": {
 				"map-visit": "^1.0.0",
 				"object-visit": "^1.0.0"
@@ -2995,7 +2718,6 @@
 			"version": "0.11.4",
 			"resolved": "https://registry.npmjs.org/color/-/color-0.11.4.tgz",
 			"integrity": "sha1-bXtcdPtl6EHNSHkq0e1eB7kE12Q=",
-			"dev": true,
 			"requires": {
 				"clone": "^1.0.2",
 				"color-convert": "^1.3.0",
@@ -3019,7 +2741,6 @@
 			"version": "0.3.0",
 			"resolved": "https://registry.npmjs.org/color-string/-/color-string-0.3.0.tgz",
 			"integrity": "sha1-J9RvtnAlxcL6JZk7+/V55HhBuZE=",
-			"dev": true,
 			"requires": {
 				"color-name": "^1.0.0"
 			}
@@ -3028,7 +2749,6 @@
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/colormin/-/colormin-1.1.2.tgz",
 			"integrity": "sha1-6i90IKcrlogaOKrlnsEkpvcpgTM=",
-			"dev": true,
 			"requires": {
 				"color": "^0.11.0",
 				"css-color-names": "0.0.4",
@@ -3038,8 +2758,7 @@
 		"colors": {
 			"version": "0.5.1",
 			"resolved": "https://registry.npmjs.org/colors/-/colors-0.5.1.tgz",
-			"integrity": "sha1-fQAj6usVTo7p/Oddy5I9DtFmd3Q=",
-			"dev": true
+			"integrity": "sha1-fQAj6usVTo7p/Oddy5I9DtFmd3Q="
 		},
 		"columnify": {
 			"version": "1.5.4",
@@ -3054,7 +2773,6 @@
 			"version": "1.0.6",
 			"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz",
 			"integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=",
-			"dev": true,
 			"requires": {
 				"delayed-stream": "~1.0.0"
 			}
@@ -3080,8 +2798,7 @@
 		"commondir": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-			"integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
-			"dev": true
+			"integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs="
 		},
 		"compare-func": {
 			"version": "1.3.2",
@@ -3095,14 +2812,12 @@
 		"compare-versions": {
 			"version": "3.2.1",
 			"resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-3.2.1.tgz",
-			"integrity": "sha512-2y2nHcopMG/NAyk6vWXlLs86XeM9sik4jmx1tKIgzMi9/RQ2eo758RGpxQO3ErihHmg0RlQITPqgz73y6s7quA==",
-			"dev": true
+			"integrity": "sha512-2y2nHcopMG/NAyk6vWXlLs86XeM9sik4jmx1tKIgzMi9/RQ2eo758RGpxQO3ErihHmg0RlQITPqgz73y6s7quA=="
 		},
 		"component-emitter": {
 			"version": "1.2.1",
 			"resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
-			"integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
-			"dev": true
+			"integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY="
 		},
 		"computed-style": {
 			"version": "0.1.4",
@@ -3129,7 +2844,6 @@
 			"version": "3.5.0",
 			"resolved": "https://registry.npmjs.org/concurrently/-/concurrently-3.5.0.tgz",
 			"integrity": "sha1-jPG3cHppFqeKT/W3e7BN7FSzebI=",
-			"dev": true,
 			"requires": {
 				"chalk": "0.5.1",
 				"commander": "2.6.0",
@@ -3144,20 +2858,17 @@
 				"ansi-regex": {
 					"version": "0.2.1",
 					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz",
-					"integrity": "sha1-DY6UaWej2BQ/k+JOKYUl/BsiNfk=",
-					"dev": true
+					"integrity": "sha1-DY6UaWej2BQ/k+JOKYUl/BsiNfk="
 				},
 				"ansi-styles": {
 					"version": "1.1.0",
 					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz",
-					"integrity": "sha1-6uy/Zs1waIJ2Cy9GkVgrj1XXp94=",
-					"dev": true
+					"integrity": "sha1-6uy/Zs1waIJ2Cy9GkVgrj1XXp94="
 				},
 				"chalk": {
 					"version": "0.5.1",
 					"resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
 					"integrity": "sha1-Zjs6ZItotV0EaQ1JFnqoN4WPIXQ=",
-					"dev": true,
 					"requires": {
 						"ansi-styles": "^1.1.0",
 						"escape-string-regexp": "^1.0.0",
@@ -3169,22 +2880,19 @@
 						"supports-color": {
 							"version": "0.2.0",
 							"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz",
-							"integrity": "sha1-2S3iaU6z9nMjlz1649i1W0wiGQo=",
-							"dev": true
+							"integrity": "sha1-2S3iaU6z9nMjlz1649i1W0wiGQo="
 						}
 					}
 				},
 				"commander": {
 					"version": "2.6.0",
 					"resolved": "https://registry.npmjs.org/commander/-/commander-2.6.0.tgz",
-					"integrity": "sha1-nfflL7Kgyw+4kFjugMMQQiXzfh0=",
-					"dev": true
+					"integrity": "sha1-nfflL7Kgyw+4kFjugMMQQiXzfh0="
 				},
 				"has-ansi": {
 					"version": "0.1.0",
 					"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
 					"integrity": "sha1-hPJlqujA5qiKEtcCKJS3VoiUxi4=",
-					"dev": true,
 					"requires": {
 						"ansi-regex": "^0.2.0"
 					}
@@ -3192,14 +2900,12 @@
 				"has-flag": {
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-					"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-					"dev": true
+					"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
 				},
 				"strip-ansi": {
 					"version": "0.3.0",
 					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
 					"integrity": "sha1-JfSOoiynkYfzF0pNuHWTR7sSYiA=",
-					"dev": true,
 					"requires": {
 						"ansi-regex": "^0.2.1"
 					}
@@ -3208,7 +2914,6 @@
 					"version": "3.2.3",
 					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
 					"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-					"dev": true,
 					"requires": {
 						"has-flag": "^1.0.0"
 					}
@@ -3228,7 +2933,6 @@
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
 			"integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
-			"dev": true,
 			"requires": {
 				"date-now": "^0.1.4"
 			}
@@ -3241,14 +2945,12 @@
 		"constants-browserify": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
-			"integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
-			"dev": true
+			"integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U="
 		},
 		"continuable-cache": {
 			"version": "0.3.1",
 			"resolved": "https://registry.npmjs.org/continuable-cache/-/continuable-cache-0.3.1.tgz",
-			"integrity": "sha1-vXJ6f67XfnH/OYWskzUakSczrQ8=",
-			"dev": true
+			"integrity": "sha1-vXJ6f67XfnH/OYWskzUakSczrQ8="
 		},
 		"conventional-changelog": {
 			"version": "1.1.24",
@@ -3564,14 +3266,12 @@
 		"convert-source-map": {
 			"version": "1.5.1",
 			"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.1.tgz",
-			"integrity": "sha1-uCeAl7m8IpNl3lxiz1/K7YtVmeU=",
-			"dev": true
+			"integrity": "sha1-uCeAl7m8IpNl3lxiz1/K7YtVmeU="
 		},
 		"copy-concurrently": {
 			"version": "1.0.5",
 			"resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
 			"integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
-			"dev": true,
 			"requires": {
 				"aproba": "^1.1.1",
 				"fs-write-stream-atomic": "^1.0.8",
@@ -3584,14 +3284,12 @@
 		"copy-descriptor": {
 			"version": "0.1.1",
 			"resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
-			"integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
-			"dev": true
+			"integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40="
 		},
 		"core-js": {
 			"version": "2.5.3",
 			"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.3.tgz",
-			"integrity": "sha1-isw4NFgk8W2DZbfJtCWRaOjtYD4=",
-			"dev": true
+			"integrity": "sha1-isw4NFgk8W2DZbfJtCWRaOjtYD4="
 		},
 		"core-util-is": {
 			"version": "1.0.2",
@@ -3602,7 +3300,6 @@
 			"version": "2.2.2",
 			"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-2.2.2.tgz",
 			"integrity": "sha512-GiNXLwAFPYHy25XmTPpafYvn3CLAkJ8FLsscq78MQd1Kh0OU6Yzhn4eV2MVF4G9WEQZoWEGltatdR+ntGPMl5A==",
-			"dev": true,
 			"requires": {
 				"is-directory": "^0.3.1",
 				"js-yaml": "^3.4.3",
@@ -3616,14 +3313,12 @@
 				"minimist": {
 					"version": "1.2.0",
 					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-					"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-					"dev": true
+					"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
 				},
 				"parse-json": {
 					"version": "2.2.0",
 					"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
 					"integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-					"dev": true,
 					"requires": {
 						"error-ex": "^1.2.0"
 					}
@@ -3634,7 +3329,6 @@
 			"version": "4.0.3",
 			"resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz",
 			"integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==",
-			"dev": true,
 			"requires": {
 				"bn.js": "^4.1.0",
 				"elliptic": "^6.0.0"
@@ -3652,7 +3346,6 @@
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
 			"integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
-			"dev": true,
 			"requires": {
 				"cipher-base": "^1.0.1",
 				"inherits": "^2.0.1",
@@ -3665,7 +3358,6 @@
 			"version": "1.1.7",
 			"resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
 			"integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
-			"dev": true,
 			"requires": {
 				"cipher-base": "^1.0.3",
 				"create-hash": "^1.1.0",
@@ -3679,7 +3371,6 @@
 			"version": "3.2.4",
 			"resolved": "https://registry.npmjs.org/cross-env/-/cross-env-3.2.4.tgz",
 			"integrity": "sha1-ngWF8neGTtQhznVvgamA/w1piro=",
-			"dev": true,
 			"requires": {
 				"cross-spawn": "^5.1.0",
 				"is-windows": "^1.0.0"
@@ -3710,7 +3401,6 @@
 			"version": "3.1.2",
 			"resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz",
 			"integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=",
-			"dev": true,
 			"requires": {
 				"boom": "5.x.x"
 			},
@@ -3719,7 +3409,6 @@
 					"version": "5.2.0",
 					"resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz",
 					"integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==",
-					"dev": true,
 					"requires": {
 						"hoek": "4.x.x"
 					}
@@ -3730,7 +3419,6 @@
 			"version": "3.12.0",
 			"resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
 			"integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
-			"dev": true,
 			"requires": {
 				"browserify-cipher": "^1.0.0",
 				"browserify-sign": "^4.0.0",
@@ -3749,7 +3437,6 @@
 			"version": "1.3.3",
 			"resolved": "https://registry.npmjs.org/css-color-function/-/css-color-function-1.3.3.tgz",
 			"integrity": "sha1-jtJMLAIFBzM5+voAS8jBQfzLKC4=",
-			"dev": true,
 			"requires": {
 				"balanced-match": "0.1.0",
 				"color": "^0.11.0",
@@ -3760,14 +3447,12 @@
 				"balanced-match": {
 					"version": "0.1.0",
 					"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.1.0.tgz",
-					"integrity": "sha1-tQS9BYabOSWd0MXvw12EMXbczEo=",
-					"dev": true
+					"integrity": "sha1-tQS9BYabOSWd0MXvw12EMXbczEo="
 				},
 				"debug": {
 					"version": "3.1.0",
 					"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
 					"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-					"dev": true,
 					"requires": {
 						"ms": "2.0.0"
 					}
@@ -3777,14 +3462,12 @@
 		"css-color-names": {
 			"version": "0.0.4",
 			"resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
-			"integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=",
-			"dev": true
+			"integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA="
 		},
 		"css-select": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz",
 			"integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=",
-			"dev": true,
 			"requires": {
 				"boolbase": "~1.0.0",
 				"css-what": "2.1",
@@ -3795,14 +3478,12 @@
 		"css-what": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.0.tgz",
-			"integrity": "sha1-lGfQMsOM+u+58teVASUwYvh/ob0=",
-			"dev": true
+			"integrity": "sha1-lGfQMsOM+u+58teVASUwYvh/ob0="
 		},
 		"cssnano": {
 			"version": "3.10.0",
 			"resolved": "https://registry.npmjs.org/cssnano/-/cssnano-3.10.0.tgz",
 			"integrity": "sha1-Tzj2zqK5sX+gFJDyPx3GjqZcHDg=",
-			"dev": true,
 			"requires": {
 				"autoprefixer": "^6.3.1",
 				"decamelize": "^1.1.2",
@@ -3841,14 +3522,12 @@
 				"ansi-styles": {
 					"version": "2.2.1",
 					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-					"dev": true
+					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
 				},
 				"autoprefixer": {
 					"version": "6.7.7",
 					"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.7.7.tgz",
 					"integrity": "sha1-Hb0cg1ZY41zj+ZhAmdsAWFx4IBQ=",
-					"dev": true,
 					"requires": {
 						"browserslist": "^1.7.6",
 						"caniuse-db": "^1.0.30000634",
@@ -3862,7 +3541,6 @@
 					"version": "1.7.7",
 					"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz",
 					"integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
-					"dev": true,
 					"requires": {
 						"caniuse-db": "^1.0.30000639",
 						"electron-to-chromium": "^1.2.7"
@@ -3872,7 +3550,6 @@
 					"version": "1.1.3",
 					"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
 					"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-					"dev": true,
 					"requires": {
 						"ansi-styles": "^2.2.1",
 						"escape-string-regexp": "^1.0.2",
@@ -3884,22 +3561,19 @@
 						"supports-color": {
 							"version": "2.0.0",
 							"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-							"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-							"dev": true
+							"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
 						}
 					}
 				},
 				"has-flag": {
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-					"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-					"dev": true
+					"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
 				},
 				"postcss": {
 					"version": "5.2.18",
 					"resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
 					"integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-					"dev": true,
 					"requires": {
 						"chalk": "^1.1.3",
 						"js-base64": "^2.1.9",
@@ -3910,14 +3584,12 @@
 				"source-map": {
 					"version": "0.5.7",
 					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-					"dev": true
+					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
 				},
 				"supports-color": {
 					"version": "3.2.3",
 					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
 					"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-					"dev": true,
 					"requires": {
 						"has-flag": "^1.0.0"
 					}
@@ -3928,7 +3600,6 @@
 			"version": "2.3.2",
 			"resolved": "https://registry.npmjs.org/csso/-/csso-2.3.2.tgz",
 			"integrity": "sha1-3dUsWHAz9J6Utx/FVWnyUuj/X4U=",
-			"dev": true,
 			"requires": {
 				"clap": "^1.0.9",
 				"source-map": "^0.5.3"
@@ -3937,22 +3608,19 @@
 				"source-map": {
 					"version": "0.5.7",
 					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-					"dev": true
+					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
 				}
 			}
 		},
 		"cssom": {
 			"version": "0.3.2",
 			"resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.2.tgz",
-			"integrity": "sha1-uANhcMefB6kP8vFuIihAJ6JDhIs=",
-			"dev": true
+			"integrity": "sha1-uANhcMefB6kP8vFuIihAJ6JDhIs="
 		},
 		"cssstyle": {
 			"version": "0.3.1",
 			"resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-0.3.1.tgz",
 			"integrity": "sha512-tNvaxM5blOnxanyxI6panOsnfiyLRj3HV4qjqqS45WPNS1usdYWRUQjqTEEELK73lpeP/1KoIGYUwrBn/VcECA==",
-			"dev": true,
 			"requires": {
 				"cssom": "0.3.x"
 			}
@@ -3968,14 +3636,12 @@
 		"cyclist": {
 			"version": "0.2.2",
 			"resolved": "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz",
-			"integrity": "sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=",
-			"dev": true
+			"integrity": "sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA="
 		},
 		"damerau-levenshtein": {
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.4.tgz",
-			"integrity": "sha1-AxkcQyy27qFou3fzpV/9zLiXhRQ=",
-			"dev": true
+			"integrity": "sha1-AxkcQyy27qFou3fzpV/9zLiXhRQ="
 		},
 		"dargs": {
 			"version": "4.1.0",
@@ -3989,7 +3655,6 @@
 			"version": "1.14.1",
 			"resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
 			"integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-			"dev": true,
 			"requires": {
 				"assert-plus": "^1.0.0"
 			}
@@ -3998,7 +3663,6 @@
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/data-urls/-/data-urls-1.0.0.tgz",
 			"integrity": "sha512-ai40PPQR0Fn1lD2PPie79CibnlMN2AYiDhwFX/rZHVsxbs5kNJSjegqXIprhouGXlRdEnfybva7kqRGnB6mypA==",
-			"dev": true,
 			"requires": {
 				"abab": "^1.0.4",
 				"whatwg-mimetype": "^2.0.0",
@@ -4008,14 +3672,12 @@
 		"date-fns": {
 			"version": "1.29.0",
 			"resolved": "https://registry.npmjs.org/date-fns/-/date-fns-1.29.0.tgz",
-			"integrity": "sha512-lbTXWZ6M20cWH8N9S6afb0SBm6tMk+uUg6z3MqHPKE9atmsY3kJkTm8vKe93izJ2B2+q5MV990sM2CHgtAZaOw==",
-			"dev": true
+			"integrity": "sha512-lbTXWZ6M20cWH8N9S6afb0SBm6tMk+uUg6z3MqHPKE9atmsY3kJkTm8vKe93izJ2B2+q5MV990sM2CHgtAZaOw=="
 		},
 		"date-now": {
 			"version": "0.1.4",
 			"resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz",
-			"integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=",
-			"dev": true
+			"integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs="
 		},
 		"dateformat": {
 			"version": "3.0.3",
@@ -4026,7 +3688,6 @@
 			"version": "2.6.9",
 			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
 			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-			"dev": true,
 			"requires": {
 				"ms": "2.0.0"
 			}
@@ -4055,14 +3716,12 @@
 		"decode-uri-component": {
 			"version": "0.2.0",
 			"resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
-			"integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
-			"dev": true
+			"integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU="
 		},
 		"decompress-response": {
 			"version": "3.3.0",
 			"resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
 			"integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=",
-			"dev": true,
 			"requires": {
 				"mimic-response": "^1.0.0"
 			}
@@ -4076,7 +3735,6 @@
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/deep-equal-ident/-/deep-equal-ident-1.1.1.tgz",
 			"integrity": "sha1-BvS4nlNxDNbOpKd4HHqVZkLejck=",
-			"dev": true,
 			"requires": {
 				"lodash.isequal": "^3.0"
 			}
@@ -4089,20 +3747,17 @@
 		"deep-freeze": {
 			"version": "0.0.1",
 			"resolved": "https://registry.npmjs.org/deep-freeze/-/deep-freeze-0.0.1.tgz",
-			"integrity": "sha1-OgsABd4YZygZ39OM0x+RF5yJPoQ=",
-			"dev": true
+			"integrity": "sha1-OgsABd4YZygZ39OM0x+RF5yJPoQ="
 		},
 		"deep-is": {
 			"version": "0.1.3",
 			"resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
-			"integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
-			"dev": true
+			"integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ="
 		},
 		"default-require-extensions": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-1.0.0.tgz",
 			"integrity": "sha1-836hXT4T/9m0N9M+GnW1+5eHTLg=",
-			"dev": true,
 			"requires": {
 				"strip-bom": "^2.0.0"
 			},
@@ -4111,7 +3766,6 @@
 					"version": "2.0.0",
 					"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
 					"integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-					"dev": true,
 					"requires": {
 						"is-utf8": "^0.2.0"
 					}
@@ -4130,7 +3784,6 @@
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz",
 			"integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=",
-			"dev": true,
 			"requires": {
 				"foreach": "^2.0.5",
 				"object-keys": "^1.0.8"
@@ -4140,7 +3793,6 @@
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
 			"integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
-			"dev": true,
 			"requires": {
 				"is-descriptor": "^1.0.2",
 				"isobject": "^3.0.1"
@@ -4150,7 +3802,6 @@
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
 					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-					"dev": true,
 					"requires": {
 						"kind-of": "^6.0.0"
 					}
@@ -4159,7 +3810,6 @@
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
 					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-					"dev": true,
 					"requires": {
 						"kind-of": "^6.0.0"
 					}
@@ -4168,7 +3818,6 @@
 					"version": "1.0.2",
 					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
 					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-					"dev": true,
 					"requires": {
 						"is-accessor-descriptor": "^1.0.0",
 						"is-data-descriptor": "^1.0.0",
@@ -4178,22 +3827,19 @@
 				"kind-of": {
 					"version": "6.0.2",
 					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-					"dev": true
+					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
 				}
 			}
 		},
 		"defined": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz",
-			"integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=",
-			"dev": true
+			"integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM="
 		},
 		"del": {
 			"version": "2.2.2",
 			"resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz",
 			"integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=",
-			"dev": true,
 			"requires": {
 				"globby": "^5.0.0",
 				"is-path-cwd": "^1.0.0",
@@ -4208,7 +3854,6 @@
 					"version": "5.0.0",
 					"resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz",
 					"integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=",
-					"dev": true,
 					"requires": {
 						"array-union": "^1.0.1",
 						"arrify": "^1.0.0",
@@ -4221,16 +3866,14 @@
 				"pify": {
 					"version": "2.3.0",
 					"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-					"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-					"dev": true
+					"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
 				}
 			}
 		},
 		"delayed-stream": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-			"integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
-			"dev": true
+			"integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
 		},
 		"delegate": {
 			"version": "3.2.0",
@@ -4246,7 +3889,6 @@
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz",
 			"integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=",
-			"dev": true,
 			"requires": {
 				"inherits": "^2.0.1",
 				"minimalistic-assert": "^1.0.0"
@@ -4255,8 +3897,7 @@
 		"detect-conflict": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/detect-conflict/-/detect-conflict-1.0.1.tgz",
-			"integrity": "sha1-CIZXpmqWHAUBnbfEIwiDsca0F24=",
-			"dev": true
+			"integrity": "sha1-CIZXpmqWHAUBnbfEIwiDsca0F24="
 		},
 		"detect-indent": {
 			"version": "5.0.0",
@@ -4266,20 +3907,17 @@
 		"detect-newline": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-2.1.0.tgz",
-			"integrity": "sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I=",
-			"dev": true
+			"integrity": "sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I="
 		},
 		"diff": {
 			"version": "3.5.0",
 			"resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
-			"integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
-			"dev": true
+			"integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA=="
 		},
 		"diffie-hellman": {
 			"version": "5.0.3",
 			"resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
 			"integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
-			"dev": true,
 			"requires": {
 				"bn.js": "^4.1.0",
 				"miller-rabin": "^4.0.0",
@@ -4290,7 +3928,6 @@
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz",
 			"integrity": "sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==",
-			"dev": true,
 			"requires": {
 				"arrify": "^1.0.1",
 				"path-type": "^3.0.0"
@@ -4299,14 +3936,12 @@
 		"discontinuous-range": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/discontinuous-range/-/discontinuous-range-1.0.0.tgz",
-			"integrity": "sha1-44Mx8IRLukm5qctxx3FYWqsbxlo=",
-			"dev": true
+			"integrity": "sha1-44Mx8IRLukm5qctxx3FYWqsbxlo="
 		},
 		"doctrine": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
 			"integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-			"dev": true,
 			"requires": {
 				"esutils": "^2.0.2"
 			}
@@ -4325,7 +3960,6 @@
 			"version": "0.1.0",
 			"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
 			"integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=",
-			"dev": true,
 			"requires": {
 				"domelementtype": "~1.1.1",
 				"entities": "~1.1.1"
@@ -4334,28 +3968,24 @@
 				"domelementtype": {
 					"version": "1.1.3",
 					"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz",
-					"integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=",
-					"dev": true
+					"integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs="
 				}
 			}
 		},
 		"domain-browser": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
-			"integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
-			"dev": true
+			"integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA=="
 		},
 		"domelementtype": {
 			"version": "1.3.0",
 			"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz",
-			"integrity": "sha1-sXrtguirWeUt2cGbF1bg/BhyBMI=",
-			"dev": true
+			"integrity": "sha1-sXrtguirWeUt2cGbF1bg/BhyBMI="
 		},
 		"domexception": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/domexception/-/domexception-1.0.1.tgz",
 			"integrity": "sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==",
-			"dev": true,
 			"requires": {
 				"webidl-conversions": "^4.0.2"
 			}
@@ -4364,7 +3994,6 @@
 			"version": "2.4.2",
 			"resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz",
 			"integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==",
-			"dev": true,
 			"requires": {
 				"domelementtype": "1"
 			}
@@ -4373,7 +4002,6 @@
 			"version": "1.5.1",
 			"resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
 			"integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=",
-			"dev": true,
 			"requires": {
 				"dom-serializer": "0",
 				"domelementtype": "1"
@@ -4401,7 +4029,6 @@
 			"version": "3.6.0",
 			"resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.6.0.tgz",
 			"integrity": "sha512-fO3Di4tBKJpYTFHAxTU00BcfWMY9w24r/x21a6rZRbsD/ToUgGxsMbiGRmB7uVAXeGKXD9MwiLZa5E97EVgIRQ==",
-			"dev": true,
 			"requires": {
 				"end-of-stream": "^1.0.0",
 				"inherits": "^2.0.1",
@@ -4413,7 +4040,6 @@
 			"version": "0.1.1",
 			"resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
 			"integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
-			"dev": true,
 			"optional": true,
 			"requires": {
 				"jsbn": "~0.1.0"
@@ -4422,8 +4048,7 @@
 		"editions": {
 			"version": "1.3.4",
 			"resolved": "https://registry.npmjs.org/editions/-/editions-1.3.4.tgz",
-			"integrity": "sha512-gzao+mxnYDzIysXKMQi/+M1mjy/rjestjg6OPoYTtI+3Izp23oiGZitsl9lPDPiTGXbcSIk1iJWhliSaglxnUg==",
-			"dev": true
+			"integrity": "sha512-gzao+mxnYDzIysXKMQi/+M1mjy/rjestjg6OPoYTtI+3Izp23oiGZitsl9lPDPiTGXbcSIk1iJWhliSaglxnUg=="
 		},
 		"editorconfig": {
 			"version": "0.13.3",
@@ -4440,20 +4065,17 @@
 		"ejs": {
 			"version": "2.6.1",
 			"resolved": "https://registry.npmjs.org/ejs/-/ejs-2.6.1.tgz",
-			"integrity": "sha512-0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ==",
-			"dev": true
+			"integrity": "sha512-0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ=="
 		},
 		"electron-to-chromium": {
 			"version": "1.3.47",
 			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.47.tgz",
-			"integrity": "sha1-dk6IfKkQTQGgrI6r7n38DizhQQQ=",
-			"dev": true
+			"integrity": "sha1-dk6IfKkQTQGgrI6r7n38DizhQQQ="
 		},
 		"elegant-spinner": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/elegant-spinner/-/elegant-spinner-1.0.1.tgz",
-			"integrity": "sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=",
-			"dev": true
+			"integrity": "sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4="
 		},
 		"element-closest": {
 			"version": "2.0.2",
@@ -4464,7 +4086,6 @@
 			"version": "6.4.0",
 			"resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz",
 			"integrity": "sha1-ysmvh2LIWDYYcAPI3+GT5eLq5d8=",
-			"dev": true,
 			"requires": {
 				"bn.js": "^4.4.0",
 				"brorand": "^1.0.1",
@@ -4478,14 +4099,12 @@
 		"emoji-regex": {
 			"version": "6.5.1",
 			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-6.5.1.tgz",
-			"integrity": "sha512-PAHp6TxrCy7MGMFidro8uikr+zlJJKJ/Q6mm2ExZ7HwkyR9lSVFfE3kt36qcwa24BQL7y0G9axycGjK1A/0uNQ==",
-			"dev": true
+			"integrity": "sha512-PAHp6TxrCy7MGMFidro8uikr+zlJJKJ/Q6mm2ExZ7HwkyR9lSVFfE3kt36qcwa24BQL7y0G9axycGjK1A/0uNQ=="
 		},
 		"emojis-list": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
-			"integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
-			"dev": true
+			"integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k="
 		},
 		"encoding": {
 			"version": "0.1.12",
@@ -4499,7 +4118,6 @@
 			"version": "1.4.1",
 			"resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
 			"integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
-			"dev": true,
 			"requires": {
 				"once": "^1.4.0"
 			}
@@ -4508,7 +4126,6 @@
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.0.0.tgz",
 			"integrity": "sha512-jox/62b2GofV1qTUQTMPEJSDIGycS43evqYzD/KVtEb9OCoki9cnacUPxCrZa7JfPzZSYOCZhu9O9luaMxAX8g==",
-			"dev": true,
 			"requires": {
 				"graceful-fs": "^4.1.2",
 				"memory-fs": "^0.4.0",
@@ -4518,20 +4135,17 @@
 		"entities": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz",
-			"integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA=",
-			"dev": true
+			"integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA="
 		},
 		"envinfo": {
 			"version": "4.4.2",
 			"resolved": "https://registry.npmjs.org/envinfo/-/envinfo-4.4.2.tgz",
-			"integrity": "sha512-5rfRs+m+6pwoKRCFqpsA5+qsLngFms1aWPrxfKbrObCzQaPc3M3yPloZx+BL9UE3dK58cxw36XVQbFRSCCfGSQ==",
-			"dev": true
+			"integrity": "sha512-5rfRs+m+6pwoKRCFqpsA5+qsLngFms1aWPrxfKbrObCzQaPc3M3yPloZx+BL9UE3dK58cxw36XVQbFRSCCfGSQ=="
 		},
 		"enzyme": {
 			"version": "3.3.0",
 			"resolved": "https://registry.npmjs.org/enzyme/-/enzyme-3.3.0.tgz",
 			"integrity": "sha512-l8csyPyLmtxskTz6pX9W8eDOyH1ckEtDttXk/vlFWCjv00SkjTjtoUrogqp4yEvMyneU9dUJoOLnqFoiHb8IHA==",
-			"dev": true,
 			"requires": {
 				"cheerio": "^1.0.0-rc.2",
 				"function.prototype.name": "^1.0.3",
@@ -4555,7 +4169,6 @@
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.1.1.tgz",
 			"integrity": "sha512-kC8pAtU2Jk3OJ0EG8Y2813dg9Ol0TXi7UNxHzHiWs30Jo/hj7alc//G1YpKUsPP1oKl9X+Lkx+WlGJpPYA+nvw==",
-			"dev": true,
 			"requires": {
 				"enzyme-adapter-utils": "^1.3.0",
 				"lodash": "^4.17.4",
@@ -4570,7 +4183,6 @@
 					"version": "15.6.1",
 					"resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.1.tgz",
 					"integrity": "sha512-4ec7bY1Y66LymSUOH/zARVYObB23AT2h8cf6e/O6ZALB/N0sqZFEx7rq6EYPX2MkOdKORuooI/H5k9TlR4q7kQ==",
-					"dev": true,
 					"requires": {
 						"fbjs": "^0.8.16",
 						"loose-envify": "^1.3.1",
@@ -4583,7 +4195,6 @@
 			"version": "1.3.0",
 			"resolved": "https://registry.npmjs.org/enzyme-adapter-utils/-/enzyme-adapter-utils-1.3.0.tgz",
 			"integrity": "sha512-vVXSt6uDv230DIv+ebCG66T1Pm36Kv+m74L1TrF4kaE7e1V7Q/LcxO0QRkajk5cA6R3uu9wJf5h13wOTezTbjA==",
-			"dev": true,
 			"requires": {
 				"lodash": "^4.17.4",
 				"object.assign": "^4.0.4",
@@ -4594,7 +4205,6 @@
 					"version": "15.6.1",
 					"resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.1.tgz",
 					"integrity": "sha512-4ec7bY1Y66LymSUOH/zARVYObB23AT2h8cf6e/O6ZALB/N0sqZFEx7rq6EYPX2MkOdKORuooI/H5k9TlR4q7kQ==",
-					"dev": true,
 					"requires": {
 						"fbjs": "^0.8.16",
 						"loose-envify": "^1.3.1",
@@ -4607,7 +4217,6 @@
 			"version": "4.2.0",
 			"resolved": "https://registry.npmjs.org/enzyme-matchers/-/enzyme-matchers-4.2.0.tgz",
 			"integrity": "sha512-5Gf/mAVYx6KPAUuxuDhAGt/gu9ndPd6duFcVnH2rbEad2clgTpHZL4Df49FHFukrjEEubX9rhfeAKx0/sbfVkQ==",
-			"dev": true,
 			"requires": {
 				"circular-json-es6": "^2.0.1",
 				"deep-equal-ident": "^1.1.1"
@@ -4617,7 +4226,6 @@
 			"version": "3.3.4",
 			"resolved": "https://registry.npmjs.org/enzyme-to-json/-/enzyme-to-json-3.3.4.tgz",
 			"integrity": "sha1-Z8YEDpMRgvGDQYry659DIyWKp38=",
-			"dev": true,
 			"requires": {
 				"lodash": "^4.17.4"
 			}
@@ -4631,7 +4239,6 @@
 			"version": "0.1.7",
 			"resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
 			"integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
-			"dev": true,
 			"requires": {
 				"prr": "~1.0.1"
 			}
@@ -4640,7 +4247,6 @@
 			"version": "7.0.2",
 			"resolved": "https://registry.npmjs.org/error/-/error-7.0.2.tgz",
 			"integrity": "sha1-pfdf/02ZJhJt2sDqXcOOaJFTywI=",
-			"dev": true,
 			"requires": {
 				"string-template": "~0.2.1",
 				"xtend": "~4.0.0"
@@ -4658,7 +4264,6 @@
 			"version": "1.11.0",
 			"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.11.0.tgz",
 			"integrity": "sha512-ZnQrE/lXTTQ39ulXZ+J1DTFazV9qBy61x2bY071B+qGco8Z8q1QddsLdt/EF8Ai9hcWH72dWS0kFqXLxOxqslA==",
-			"dev": true,
 			"requires": {
 				"es-to-primitive": "^1.1.1",
 				"function-bind": "^1.1.1",
@@ -4671,7 +4276,6 @@
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.1.1.tgz",
 			"integrity": "sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=",
-			"dev": true,
 			"requires": {
 				"is-callable": "^1.1.1",
 				"is-date-object": "^1.0.1",
@@ -4681,14 +4285,12 @@
 		"es6-promise": {
 			"version": "4.2.4",
 			"resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.4.tgz",
-			"integrity": "sha512-/NdNZVJg+uZgtm9eS3O6lrOLYmQag2DjdEXuPaHlZ6RuVqgqaVZfgYCepEIKsLqwdQArOPtC3XzRLqGGfT8KQQ==",
-			"dev": true
+			"integrity": "sha512-/NdNZVJg+uZgtm9eS3O6lrOLYmQag2DjdEXuPaHlZ6RuVqgqaVZfgYCepEIKsLqwdQArOPtC3XzRLqGGfT8KQQ=="
 		},
 		"es6-promisify": {
 			"version": "5.0.0",
 			"resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz",
 			"integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=",
-			"dev": true,
 			"requires": {
 				"es6-promise": "^4.0.3"
 			}
@@ -4702,7 +4304,6 @@
 			"version": "1.9.1",
 			"resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.9.1.tgz",
 			"integrity": "sha512-6hTjO1NAWkHnDk3OqQ4YrCuwwmGHL9S3nPlzBOUG/R44rda3wLNrfvQ5fkSGjyhHFKM7ALPKcKGrwvCLe0lC7Q==",
-			"dev": true,
 			"requires": {
 				"esprima": "^3.1.3",
 				"estraverse": "^4.2.0",
@@ -4714,14 +4315,12 @@
 				"esprima": {
 					"version": "3.1.3",
 					"resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
-					"integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=",
-					"dev": true
+					"integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM="
 				},
 				"source-map": {
 					"version": "0.6.1",
 					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
 					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-					"dev": true,
 					"optional": true
 				}
 			}
@@ -4730,7 +4329,6 @@
 			"version": "4.16.0",
 			"resolved": "https://registry.npmjs.org/eslint/-/eslint-4.16.0.tgz",
 			"integrity": "sha512-YVXV4bDhNoHHcv0qzU4Meof7/P26B4EuaktMi5L1Tnt52Aov85KmYA8c5D+xyZr/BkhvwUqr011jDSD/QTULxg==",
-			"dev": true,
 			"requires": {
 				"ajv": "^5.3.0",
 				"babel-code-frame": "^6.22.0",
@@ -4774,14 +4372,12 @@
 				"ansi-regex": {
 					"version": "3.0.0",
 					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-					"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-					"dev": true
+					"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
 				},
 				"debug": {
 					"version": "3.1.0",
 					"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
 					"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-					"dev": true,
 					"requires": {
 						"ms": "2.0.0"
 					}
@@ -4789,14 +4385,12 @@
 				"globals": {
 					"version": "11.5.0",
 					"resolved": "https://registry.npmjs.org/globals/-/globals-11.5.0.tgz",
-					"integrity": "sha512-hYyf+kI8dm3nORsiiXUQigOU62hDLfJ9G01uyGMxhc6BKsircrUhC4uJPQPUSuq2GrTmiiEt7ewxlMdBewfmKQ==",
-					"dev": true
+					"integrity": "sha512-hYyf+kI8dm3nORsiiXUQigOU62hDLfJ9G01uyGMxhc6BKsircrUhC4uJPQPUSuq2GrTmiiEt7ewxlMdBewfmKQ=="
 				},
 				"strip-ansi": {
 					"version": "4.0.0",
 					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
 					"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-					"dev": true,
 					"requires": {
 						"ansi-regex": "^3.0.0"
 					}
@@ -4806,8 +4400,7 @@
 		"eslint-config-wordpress": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/eslint-config-wordpress/-/eslint-config-wordpress-2.0.0.tgz",
-			"integrity": "sha1-UgEgbGlk1kgxUjLt9t+9LpJeTNY=",
-			"dev": true
+			"integrity": "sha1-UgEgbGlk1kgxUjLt9t+9LpJeTNY="
 		},
 		"eslint-plugin-i18n": {
 			"version": "1.2.0",
@@ -4817,8 +4410,7 @@
 		"eslint-plugin-jest": {
 			"version": "21.5.0",
 			"resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-21.5.0.tgz",
-			"integrity": "sha512-4fxfe2RcqzU+IVNQL5n4pqibLcUhKKxihYsA510+6kC/FTdGInszDDHgO4ntBzPWu8mcHAvKJLs8o3AQw6eHTg==",
-			"dev": true
+			"integrity": "sha512-4fxfe2RcqzU+IVNQL5n4pqibLcUhKKxihYsA510+6kC/FTdGInszDDHgO4ntBzPWu8mcHAvKJLs8o3AQw6eHTg=="
 		},
 		"eslint-plugin-jsdoc": {
 			"version": "3.5.0",
@@ -4833,7 +4425,6 @@
 			"version": "6.0.2",
 			"resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.0.2.tgz",
 			"integrity": "sha1-ZZJ3p1iwNsMFp+ShMFfDAc075z8=",
-			"dev": true,
 			"requires": {
 				"aria-query": "^0.7.0",
 				"array-includes": "^3.0.3",
@@ -4859,7 +4450,6 @@
 			"version": "7.7.0",
 			"resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.7.0.tgz",
 			"integrity": "sha512-KC7Snr4YsWZD5flu6A5c0AcIZidzW3Exbqp7OT67OaD2AppJtlBr/GuPrW/vaQM/yfZotEvKAdrxrO+v8vwYJA==",
-			"dev": true,
 			"requires": {
 				"doctrine": "^2.0.2",
 				"has": "^1.0.1",
@@ -4871,7 +4461,6 @@
 					"version": "2.0.1",
 					"resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-2.0.1.tgz",
 					"integrity": "sha1-6AGxs5mF4g//yHtA43SAgOLcrH8=",
-					"dev": true,
 					"requires": {
 						"array-includes": "^3.0.3"
 					}
@@ -4880,7 +4469,6 @@
 					"version": "15.6.1",
 					"resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.1.tgz",
 					"integrity": "sha512-4ec7bY1Y66LymSUOH/zARVYObB23AT2h8cf6e/O6ZALB/N0sqZFEx7rq6EYPX2MkOdKORuooI/H5k9TlR4q7kQ==",
-					"dev": true,
 					"requires": {
 						"fbjs": "^0.8.16",
 						"loose-envify": "^1.3.1",
@@ -4912,7 +4500,6 @@
 			"version": "3.7.1",
 			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.1.tgz",
 			"integrity": "sha1-PWPD7f2gLgbgGkUq2IyqzHzctug=",
-			"dev": true,
 			"requires": {
 				"esrecurse": "^4.1.0",
 				"estraverse": "^4.1.1"
@@ -4921,14 +4508,12 @@
 		"eslint-visitor-keys": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz",
-			"integrity": "sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==",
-			"dev": true
+			"integrity": "sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ=="
 		},
 		"espree": {
 			"version": "3.5.4",
 			"resolved": "https://registry.npmjs.org/espree/-/espree-3.5.4.tgz",
 			"integrity": "sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==",
-			"dev": true,
 			"requires": {
 				"acorn": "^5.5.0",
 				"acorn-jsx": "^3.0.0"
@@ -4937,14 +4522,12 @@
 		"esprima": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz",
-			"integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==",
-			"dev": true
+			"integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw=="
 		},
 		"esquery": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz",
 			"integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==",
-			"dev": true,
 			"requires": {
 				"estraverse": "^4.0.0"
 			}
@@ -4953,7 +4536,6 @@
 			"version": "4.2.1",
 			"resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
 			"integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
-			"dev": true,
 			"requires": {
 				"estraverse": "^4.1.0"
 			}
@@ -4961,26 +4543,22 @@
 		"estraverse": {
 			"version": "4.2.0",
 			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
-			"integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
-			"dev": true
+			"integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM="
 		},
 		"esutils": {
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
-			"integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
-			"dev": true
+			"integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs="
 		},
 		"events": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
-			"integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=",
-			"dev": true
+			"integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ="
 		},
 		"evp_bytestokey": {
 			"version": "1.0.3",
 			"resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
 			"integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
-			"dev": true,
 			"requires": {
 				"md5.js": "^1.3.4",
 				"safe-buffer": "^5.1.1"
@@ -4990,7 +4568,6 @@
 			"version": "0.2.1",
 			"resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.2.1.tgz",
 			"integrity": "sha512-aLt95pexaugVtQerpmE51+4QfWrNc304uez7jvj6fWnN8GeEHpttB8F36n8N7uVhUMbH/1enbxQ9HImZ4w/9qg==",
-			"dev": true,
 			"requires": {
 				"merge": "^1.1.3"
 			}
@@ -5012,20 +4589,17 @@
 		"exit": {
 			"version": "0.1.2",
 			"resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
-			"integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
-			"dev": true
+			"integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw="
 		},
 		"exit-hook": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/exit-hook/-/exit-hook-1.1.1.tgz",
-			"integrity": "sha1-8FyiM7SMBdVP/wd2XfhQfpXAL/g=",
-			"dev": true
+			"integrity": "sha1-8FyiM7SMBdVP/wd2XfhQfpXAL/g="
 		},
 		"expand-brackets": {
 			"version": "2.1.4",
 			"resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
 			"integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
-			"dev": true,
 			"requires": {
 				"debug": "^2.3.3",
 				"define-property": "^0.2.5",
@@ -5040,7 +4614,6 @@
 					"version": "0.2.5",
 					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
 					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-					"dev": true,
 					"requires": {
 						"is-descriptor": "^0.1.0"
 					}
@@ -5049,7 +4622,6 @@
 					"version": "2.0.1",
 					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
 					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-					"dev": true,
 					"requires": {
 						"is-extendable": "^0.1.0"
 					}
@@ -5060,7 +4632,6 @@
 			"version": "1.8.2",
 			"resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
 			"integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
-			"dev": true,
 			"requires": {
 				"fill-range": "^2.1.0"
 			},
@@ -5069,7 +4640,6 @@
 					"version": "2.2.4",
 					"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz",
 					"integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
-					"dev": true,
 					"requires": {
 						"is-number": "^2.1.0",
 						"isobject": "^2.0.0",
@@ -5082,7 +4652,6 @@
 					"version": "2.1.0",
 					"resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
 					"integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
-					"dev": true,
 					"requires": {
 						"kind-of": "^3.0.2"
 					}
@@ -5091,7 +4660,6 @@
 					"version": "2.1.0",
 					"resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
 					"integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-					"dev": true,
 					"requires": {
 						"isarray": "1.0.0"
 					}
@@ -5102,7 +4670,6 @@
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
 			"integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
-			"dev": true,
 			"requires": {
 				"homedir-polyfill": "^1.0.1"
 			}
@@ -5111,7 +4678,6 @@
 			"version": "22.4.3",
 			"resolved": "https://registry.npmjs.org/expect/-/expect-22.4.3.tgz",
 			"integrity": "sha512-XcNXEPehqn8b/jm8FYotdX0YrXn36qp4HWlrVT4ktwQas1l1LPxiVWncYnnL2eyMtKAmVIaG0XAp0QlrqJaxaA==",
-			"dev": true,
 			"requires": {
 				"ansi-styles": "^3.2.0",
 				"jest-diff": "^22.4.3",
@@ -5124,14 +4690,12 @@
 		"extend": {
 			"version": "3.0.1",
 			"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-			"integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
-			"dev": true
+			"integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ="
 		},
 		"extend-shallow": {
 			"version": "3.0.2",
 			"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
 			"integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-			"dev": true,
 			"requires": {
 				"assign-symbols": "^1.0.0",
 				"is-extendable": "^1.0.1"
@@ -5141,7 +4705,6 @@
 					"version": "1.0.1",
 					"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
 					"integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-					"dev": true,
 					"requires": {
 						"is-plain-object": "^2.0.4"
 					}
@@ -5162,7 +4725,6 @@
 			"version": "2.0.4",
 			"resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
 			"integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-			"dev": true,
 			"requires": {
 				"array-unique": "^0.3.2",
 				"define-property": "^1.0.0",
@@ -5178,7 +4740,6 @@
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
 					"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-					"dev": true,
 					"requires": {
 						"is-descriptor": "^1.0.0"
 					}
@@ -5187,7 +4748,6 @@
 					"version": "2.0.1",
 					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
 					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-					"dev": true,
 					"requires": {
 						"is-extendable": "^0.1.0"
 					}
@@ -5196,7 +4756,6 @@
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
 					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-					"dev": true,
 					"requires": {
 						"kind-of": "^6.0.0"
 					}
@@ -5205,7 +4764,6 @@
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
 					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-					"dev": true,
 					"requires": {
 						"kind-of": "^6.0.0"
 					}
@@ -5214,7 +4772,6 @@
 					"version": "1.0.2",
 					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
 					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-					"dev": true,
 					"requires": {
 						"is-accessor-descriptor": "^1.0.0",
 						"is-data-descriptor": "^1.0.0",
@@ -5224,8 +4781,7 @@
 				"kind-of": {
 					"version": "6.0.2",
 					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-					"dev": true
+					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
 				}
 			}
 		},
@@ -5233,7 +4789,6 @@
 			"version": "4.0.0-beta.0",
 			"resolved": "https://registry.npmjs.org/extract-text-webpack-plugin/-/extract-text-webpack-plugin-4.0.0-beta.0.tgz",
 			"integrity": "sha512-Hypkn9jUTnFr0DpekNam53X47tXn3ucY08BQumv7kdGgeVUBLq3DJHJTi6HNxv4jl9W+Skxjz9+RnK0sJyqqjA==",
-			"dev": true,
 			"requires": {
 				"async": "^2.4.1",
 				"loader-utils": "^1.1.0",
@@ -5245,7 +4800,6 @@
 					"version": "2.6.0",
 					"resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz",
 					"integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==",
-					"dev": true,
 					"requires": {
 						"lodash": "^4.14.0"
 					}
@@ -5256,7 +4810,6 @@
 			"version": "1.6.6",
 			"resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.6.tgz",
 			"integrity": "sha1-EpDt6NINCHK0Kf0/NRyhKOxe+Fw=",
-			"dev": true,
 			"requires": {
 				"concat-stream": "1.6.0",
 				"debug": "2.6.9",
@@ -5268,7 +4821,6 @@
 					"version": "1.6.0",
 					"resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz",
 					"integrity": "sha1-CqxmL9Ur54lk1VMvaUeE5wEQrPc=",
-					"dev": true,
 					"requires": {
 						"inherits": "^2.0.3",
 						"readable-stream": "^2.2.2",
@@ -5279,7 +4831,6 @@
 					"version": "0.5.0",
 					"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
 					"integrity": "sha1-HXMHam35hs2TROFecfzAWkyavxI=",
-					"dev": true,
 					"requires": {
 						"minimist": "0.0.8"
 					}
@@ -5289,20 +4840,17 @@
 		"extsprintf": {
 			"version": "1.3.0",
 			"resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-			"integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
-			"dev": true
+			"integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
 		},
 		"fast-deep-equal": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
-			"integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=",
-			"dev": true
+			"integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ="
 		},
 		"fast-glob": {
 			"version": "2.2.2",
 			"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.2.tgz",
 			"integrity": "sha512-TR6zxCKftDQnUAPvkrCWdBgDq/gbqx8A3ApnBrR5rMvpp6+KMJI0Igw7fkWPgeVK0uhRXTXdvO3O+YP0CaUX2g==",
-			"dev": true,
 			"requires": {
 				"@mrmlnc/readdir-enhanced": "^2.2.1",
 				"@nodelib/fs.stat": "^1.0.1",
@@ -5316,7 +4864,6 @@
 					"version": "4.0.0",
 					"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz",
 					"integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=",
-					"dev": true,
 					"requires": {
 						"is-extglob": "^2.1.1"
 					}
@@ -5326,20 +4873,17 @@
 		"fast-json-stable-stringify": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
-			"integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=",
-			"dev": true
+			"integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I="
 		},
 		"fast-levenshtein": {
 			"version": "2.0.6",
 			"resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-			"integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
-			"dev": true
+			"integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc="
 		},
 		"faye-websocket": {
 			"version": "0.10.0",
 			"resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz",
 			"integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=",
-			"dev": true,
 			"requires": {
 				"websocket-driver": ">=0.5.1"
 			}
@@ -5348,7 +4892,6 @@
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.0.tgz",
 			"integrity": "sha1-VOmr99+i8mzZsWNsWIwa/AXeXVg=",
-			"dev": true,
 			"requires": {
 				"bser": "^2.0.0"
 			}
@@ -5378,7 +4921,6 @@
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz",
 			"integrity": "sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=",
-			"dev": true,
 			"requires": {
 				"pend": "~1.2.0"
 			}
@@ -5395,7 +4937,6 @@
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz",
 			"integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=",
-			"dev": true,
 			"requires": {
 				"flat-cache": "^1.2.1",
 				"object-assign": "^4.0.1"
@@ -5404,14 +4945,12 @@
 		"filename-regex": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
-			"integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=",
-			"dev": true
+			"integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY="
 		},
 		"fileset": {
 			"version": "2.0.3",
 			"resolved": "https://registry.npmjs.org/fileset/-/fileset-2.0.3.tgz",
 			"integrity": "sha1-jnVIqW08wjJ+5eZ0FocjozO7oqA=",
-			"dev": true,
 			"requires": {
 				"glob": "^7.0.3",
 				"minimatch": "^3.0.3"
@@ -5421,7 +4960,6 @@
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
 			"integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-			"dev": true,
 			"requires": {
 				"extend-shallow": "^2.0.1",
 				"is-number": "^3.0.0",
@@ -5433,7 +4971,6 @@
 					"version": "2.0.1",
 					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
 					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-					"dev": true,
 					"requires": {
 						"is-extendable": "^0.1.0"
 					}
@@ -5444,7 +4981,6 @@
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-1.0.0.tgz",
 			"integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=",
-			"dev": true,
 			"requires": {
 				"commondir": "^1.0.1",
 				"make-dir": "^1.0.0",
@@ -5454,8 +4990,7 @@
 		"find-parent-dir": {
 			"version": "0.3.0",
 			"resolved": "https://registry.npmjs.org/find-parent-dir/-/find-parent-dir-0.3.0.tgz",
-			"integrity": "sha1-M8RLQpqysvBkYpnF+fcY83b/jVQ=",
-			"dev": true
+			"integrity": "sha1-M8RLQpqysvBkYpnF+fcY83b/jVQ="
 		},
 		"find-up": {
 			"version": "2.1.0",
@@ -5469,7 +5004,6 @@
 			"version": "0.1.5",
 			"resolved": "https://registry.npmjs.org/findup/-/findup-0.1.5.tgz",
 			"integrity": "sha1-itkpozk7rGJ5V6fl3kYjsGsOLOs=",
-			"dev": true,
 			"requires": {
 				"colors": "~0.6.0-1",
 				"commander": "~2.1.0"
@@ -5478,14 +5012,12 @@
 				"colors": {
 					"version": "0.6.2",
 					"resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz",
-					"integrity": "sha1-JCP+ZnisDF2uiFLl0OW+CMmXq8w=",
-					"dev": true
+					"integrity": "sha1-JCP+ZnisDF2uiFLl0OW+CMmXq8w="
 				},
 				"commander": {
 					"version": "2.1.0",
 					"resolved": "https://registry.npmjs.org/commander/-/commander-2.1.0.tgz",
-					"integrity": "sha1-0SG7roYNmZKj1Re6lvVliOR8Z4E=",
-					"dev": true
+					"integrity": "sha1-0SG7roYNmZKj1Re6lvVliOR8Z4E="
 				}
 			}
 		},
@@ -5493,7 +5025,6 @@
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-2.0.0.tgz",
 			"integrity": "sha1-G97NuOCDwGZLkZRVgVd6Q6nzHXA=",
-			"dev": true,
 			"requires": {
 				"readable-stream": "^2.0.2"
 			}
@@ -5502,7 +5033,6 @@
 			"version": "1.3.0",
 			"resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.0.tgz",
 			"integrity": "sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=",
-			"dev": true,
 			"requires": {
 				"circular-json": "^0.3.1",
 				"del": "^2.0.2",
@@ -5513,20 +5043,17 @@
 		"flatten": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz",
-			"integrity": "sha1-2uRqnXj74lKSJYzB54CkHZXAN4I=",
-			"dev": true
+			"integrity": "sha1-2uRqnXj74lKSJYzB54CkHZXAN4I="
 		},
 		"flow-parser": {
 			"version": "0.72.0",
 			"resolved": "https://registry.npmjs.org/flow-parser/-/flow-parser-0.72.0.tgz",
-			"integrity": "sha512-kFaDtviKlD/rHi6NRp42KTbnPgz/nKcWUJQhqDnLDeKA8uGcRVSy0YlQjaf9M3pFo5PgC3SNFnCPpQGLtHjH2w==",
-			"dev": true
+			"integrity": "sha512-kFaDtviKlD/rHi6NRp42KTbnPgz/nKcWUJQhqDnLDeKA8uGcRVSy0YlQjaf9M3pFo5PgC3SNFnCPpQGLtHjH2w=="
 		},
 		"flush-write-stream": {
 			"version": "1.0.3",
 			"resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.3.tgz",
 			"integrity": "sha512-calZMC10u0FMUqoiunI2AiGIIUtUIvifNwkHhNupZH4cbNnW1Itkoh/Nf5HFYmDrwWPjrUxpkZT0KhuCq0jmGw==",
-			"dev": true,
 			"requires": {
 				"inherits": "^2.0.1",
 				"readable-stream": "^2.0.4"
@@ -5535,14 +5062,12 @@
 		"for-in": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
-			"integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
-			"dev": true
+			"integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA="
 		},
 		"for-own": {
 			"version": "0.1.5",
 			"resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
 			"integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
-			"dev": true,
 			"requires": {
 				"for-in": "^1.0.1"
 			}
@@ -5550,20 +5075,17 @@
 		"foreach": {
 			"version": "2.0.5",
 			"resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
-			"integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=",
-			"dev": true
+			"integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k="
 		},
 		"forever-agent": {
 			"version": "0.6.1",
 			"resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-			"integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
-			"dev": true
+			"integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
 		},
 		"form-data": {
 			"version": "2.3.2",
 			"resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz",
 			"integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=",
-			"dev": true,
 			"requires": {
 				"asynckit": "^0.4.0",
 				"combined-stream": "1.0.6",
@@ -5574,7 +5096,6 @@
 			"version": "0.2.1",
 			"resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
 			"integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
-			"dev": true,
 			"requires": {
 				"map-cache": "^0.2.2"
 			}
@@ -5583,7 +5104,6 @@
 			"version": "2.3.0",
 			"resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
 			"integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
-			"dev": true,
 			"requires": {
 				"inherits": "^2.0.1",
 				"readable-stream": "^2.0.0"
@@ -5603,7 +5123,6 @@
 			"version": "1.0.10",
 			"resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
 			"integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
-			"dev": true,
 			"requires": {
 				"graceful-fs": "^4.1.2",
 				"iferr": "^0.1.5",
@@ -5620,7 +5139,6 @@
 			"version": "1.2.4",
 			"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.4.tgz",
 			"integrity": "sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==",
-			"dev": true,
 			"optional": true,
 			"requires": {
 				"nan": "^2.9.2",
@@ -5630,24 +5148,20 @@
 				"abbrev": {
 					"version": "1.1.1",
 					"bundled": true,
-					"dev": true,
 					"optional": true
 				},
 				"ansi-regex": {
 					"version": "2.1.1",
-					"bundled": true,
-					"dev": true
+					"bundled": true
 				},
 				"aproba": {
 					"version": "1.2.0",
 					"bundled": true,
-					"dev": true,
 					"optional": true
 				},
 				"are-we-there-yet": {
 					"version": "1.1.4",
 					"bundled": true,
-					"dev": true,
 					"optional": true,
 					"requires": {
 						"delegates": "^1.0.0",
@@ -5656,13 +5170,11 @@
 				},
 				"balanced-match": {
 					"version": "1.0.0",
-					"bundled": true,
-					"dev": true
+					"bundled": true
 				},
 				"brace-expansion": {
 					"version": "1.1.11",
 					"bundled": true,
-					"dev": true,
 					"requires": {
 						"balanced-match": "^1.0.0",
 						"concat-map": "0.0.1"
@@ -5671,34 +5183,28 @@
 				"chownr": {
 					"version": "1.0.1",
 					"bundled": true,
-					"dev": true,
 					"optional": true
 				},
 				"code-point-at": {
 					"version": "1.1.0",
-					"bundled": true,
-					"dev": true
+					"bundled": true
 				},
 				"concat-map": {
 					"version": "0.0.1",
-					"bundled": true,
-					"dev": true
+					"bundled": true
 				},
 				"console-control-strings": {
 					"version": "1.1.0",
-					"bundled": true,
-					"dev": true
+					"bundled": true
 				},
 				"core-util-is": {
 					"version": "1.0.2",
 					"bundled": true,
-					"dev": true,
 					"optional": true
 				},
 				"debug": {
 					"version": "2.6.9",
 					"bundled": true,
-					"dev": true,
 					"optional": true,
 					"requires": {
 						"ms": "2.0.0"
@@ -5707,25 +5213,21 @@
 				"deep-extend": {
 					"version": "0.5.1",
 					"bundled": true,
-					"dev": true,
 					"optional": true
 				},
 				"delegates": {
 					"version": "1.0.0",
 					"bundled": true,
-					"dev": true,
 					"optional": true
 				},
 				"detect-libc": {
 					"version": "1.0.3",
 					"bundled": true,
-					"dev": true,
 					"optional": true
 				},
 				"fs-minipass": {
 					"version": "1.2.5",
 					"bundled": true,
-					"dev": true,
 					"optional": true,
 					"requires": {
 						"minipass": "^2.2.1"
@@ -5734,13 +5236,11 @@
 				"fs.realpath": {
 					"version": "1.0.0",
 					"bundled": true,
-					"dev": true,
 					"optional": true
 				},
 				"gauge": {
 					"version": "2.7.4",
 					"bundled": true,
-					"dev": true,
 					"optional": true,
 					"requires": {
 						"aproba": "^1.0.3",
@@ -5756,7 +5256,6 @@
 				"glob": {
 					"version": "7.1.2",
 					"bundled": true,
-					"dev": true,
 					"optional": true,
 					"requires": {
 						"fs.realpath": "^1.0.0",
@@ -5770,13 +5269,11 @@
 				"has-unicode": {
 					"version": "2.0.1",
 					"bundled": true,
-					"dev": true,
 					"optional": true
 				},
 				"iconv-lite": {
 					"version": "0.4.21",
 					"bundled": true,
-					"dev": true,
 					"optional": true,
 					"requires": {
 						"safer-buffer": "^2.1.0"
@@ -5785,7 +5282,6 @@
 				"ignore-walk": {
 					"version": "3.0.1",
 					"bundled": true,
-					"dev": true,
 					"optional": true,
 					"requires": {
 						"minimatch": "^3.0.4"
@@ -5794,7 +5290,6 @@
 				"inflight": {
 					"version": "1.0.6",
 					"bundled": true,
-					"dev": true,
 					"optional": true,
 					"requires": {
 						"once": "^1.3.0",
@@ -5803,19 +5298,16 @@
 				},
 				"inherits": {
 					"version": "2.0.3",
-					"bundled": true,
-					"dev": true
+					"bundled": true
 				},
 				"ini": {
 					"version": "1.3.5",
 					"bundled": true,
-					"dev": true,
 					"optional": true
 				},
 				"is-fullwidth-code-point": {
 					"version": "1.0.0",
 					"bundled": true,
-					"dev": true,
 					"requires": {
 						"number-is-nan": "^1.0.0"
 					}
@@ -5823,26 +5315,22 @@
 				"isarray": {
 					"version": "1.0.0",
 					"bundled": true,
-					"dev": true,
 					"optional": true
 				},
 				"minimatch": {
 					"version": "3.0.4",
 					"bundled": true,
-					"dev": true,
 					"requires": {
 						"brace-expansion": "^1.1.7"
 					}
 				},
 				"minimist": {
 					"version": "0.0.8",
-					"bundled": true,
-					"dev": true
+					"bundled": true
 				},
 				"minipass": {
 					"version": "2.2.4",
 					"bundled": true,
-					"dev": true,
 					"requires": {
 						"safe-buffer": "^5.1.1",
 						"yallist": "^3.0.0"
@@ -5851,7 +5339,6 @@
 				"minizlib": {
 					"version": "1.1.0",
 					"bundled": true,
-					"dev": true,
 					"optional": true,
 					"requires": {
 						"minipass": "^2.2.1"
@@ -5860,7 +5347,6 @@
 				"mkdirp": {
 					"version": "0.5.1",
 					"bundled": true,
-					"dev": true,
 					"requires": {
 						"minimist": "0.0.8"
 					}
@@ -5868,13 +5354,11 @@
 				"ms": {
 					"version": "2.0.0",
 					"bundled": true,
-					"dev": true,
 					"optional": true
 				},
 				"needle": {
 					"version": "2.2.0",
 					"bundled": true,
-					"dev": true,
 					"optional": true,
 					"requires": {
 						"debug": "^2.1.2",
@@ -5885,7 +5369,6 @@
 				"node-pre-gyp": {
 					"version": "0.10.0",
 					"bundled": true,
-					"dev": true,
 					"optional": true,
 					"requires": {
 						"detect-libc": "^1.0.2",
@@ -5903,7 +5386,6 @@
 				"nopt": {
 					"version": "4.0.1",
 					"bundled": true,
-					"dev": true,
 					"optional": true,
 					"requires": {
 						"abbrev": "1",
@@ -5913,13 +5395,11 @@
 				"npm-bundled": {
 					"version": "1.0.3",
 					"bundled": true,
-					"dev": true,
 					"optional": true
 				},
 				"npm-packlist": {
 					"version": "1.1.10",
 					"bundled": true,
-					"dev": true,
 					"optional": true,
 					"requires": {
 						"ignore-walk": "^3.0.1",
@@ -5929,7 +5409,6 @@
 				"npmlog": {
 					"version": "4.1.2",
 					"bundled": true,
-					"dev": true,
 					"optional": true,
 					"requires": {
 						"are-we-there-yet": "~1.1.2",
@@ -5940,19 +5419,16 @@
 				},
 				"number-is-nan": {
 					"version": "1.0.1",
-					"bundled": true,
-					"dev": true
+					"bundled": true
 				},
 				"object-assign": {
 					"version": "4.1.1",
 					"bundled": true,
-					"dev": true,
 					"optional": true
 				},
 				"once": {
 					"version": "1.4.0",
 					"bundled": true,
-					"dev": true,
 					"requires": {
 						"wrappy": "1"
 					}
@@ -5960,19 +5436,16 @@
 				"os-homedir": {
 					"version": "1.0.2",
 					"bundled": true,
-					"dev": true,
 					"optional": true
 				},
 				"os-tmpdir": {
 					"version": "1.0.2",
 					"bundled": true,
-					"dev": true,
 					"optional": true
 				},
 				"osenv": {
 					"version": "0.1.5",
 					"bundled": true,
-					"dev": true,
 					"optional": true,
 					"requires": {
 						"os-homedir": "^1.0.0",
@@ -5982,19 +5455,16 @@
 				"path-is-absolute": {
 					"version": "1.0.1",
 					"bundled": true,
-					"dev": true,
 					"optional": true
 				},
 				"process-nextick-args": {
 					"version": "2.0.0",
 					"bundled": true,
-					"dev": true,
 					"optional": true
 				},
 				"rc": {
 					"version": "1.2.7",
 					"bundled": true,
-					"dev": true,
 					"optional": true,
 					"requires": {
 						"deep-extend": "^0.5.1",
@@ -6006,7 +5476,6 @@
 						"minimist": {
 							"version": "1.2.0",
 							"bundled": true,
-							"dev": true,
 							"optional": true
 						}
 					}
@@ -6014,7 +5483,6 @@
 				"readable-stream": {
 					"version": "2.3.6",
 					"bundled": true,
-					"dev": true,
 					"optional": true,
 					"requires": {
 						"core-util-is": "~1.0.0",
@@ -6029,7 +5497,6 @@
 				"rimraf": {
 					"version": "2.6.2",
 					"bundled": true,
-					"dev": true,
 					"optional": true,
 					"requires": {
 						"glob": "^7.0.5"
@@ -6037,43 +5504,36 @@
 				},
 				"safe-buffer": {
 					"version": "5.1.1",
-					"bundled": true,
-					"dev": true
+					"bundled": true
 				},
 				"safer-buffer": {
 					"version": "2.1.2",
 					"bundled": true,
-					"dev": true,
 					"optional": true
 				},
 				"sax": {
 					"version": "1.2.4",
 					"bundled": true,
-					"dev": true,
 					"optional": true
 				},
 				"semver": {
 					"version": "5.5.0",
 					"bundled": true,
-					"dev": true,
 					"optional": true
 				},
 				"set-blocking": {
 					"version": "2.0.0",
 					"bundled": true,
-					"dev": true,
 					"optional": true
 				},
 				"signal-exit": {
 					"version": "3.0.2",
 					"bundled": true,
-					"dev": true,
 					"optional": true
 				},
 				"string-width": {
 					"version": "1.0.2",
 					"bundled": true,
-					"dev": true,
 					"requires": {
 						"code-point-at": "^1.0.0",
 						"is-fullwidth-code-point": "^1.0.0",
@@ -6083,7 +5543,6 @@
 				"string_decoder": {
 					"version": "1.1.1",
 					"bundled": true,
-					"dev": true,
 					"optional": true,
 					"requires": {
 						"safe-buffer": "~5.1.0"
@@ -6092,7 +5551,6 @@
 				"strip-ansi": {
 					"version": "3.0.1",
 					"bundled": true,
-					"dev": true,
 					"requires": {
 						"ansi-regex": "^2.0.0"
 					}
@@ -6100,13 +5558,11 @@
 				"strip-json-comments": {
 					"version": "2.0.1",
 					"bundled": true,
-					"dev": true,
 					"optional": true
 				},
 				"tar": {
 					"version": "4.4.1",
 					"bundled": true,
-					"dev": true,
 					"optional": true,
 					"requires": {
 						"chownr": "^1.0.1",
@@ -6121,13 +5577,11 @@
 				"util-deprecate": {
 					"version": "1.0.2",
 					"bundled": true,
-					"dev": true,
 					"optional": true
 				},
 				"wide-align": {
 					"version": "1.1.2",
 					"bundled": true,
-					"dev": true,
 					"optional": true,
 					"requires": {
 						"string-width": "^1.0.2"
@@ -6135,13 +5589,11 @@
 				},
 				"wrappy": {
 					"version": "1.0.2",
-					"bundled": true,
-					"dev": true
+					"bundled": true
 				},
 				"yallist": {
 					"version": "3.0.2",
-					"bundled": true,
-					"dev": true
+					"bundled": true
 				}
 			}
 		},
@@ -6149,7 +5601,6 @@
 			"version": "1.0.11",
 			"resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
 			"integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
-			"dev": true,
 			"requires": {
 				"graceful-fs": "^4.1.2",
 				"inherits": "~2.0.0",
@@ -6160,14 +5611,12 @@
 		"function-bind": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-			"integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-			"dev": true
+			"integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
 		},
 		"function.prototype.name": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.0.tgz",
 			"integrity": "sha512-Bs0VRrTz4ghD8pTmbJQD1mZ8A/mN0ur/jGz+A6FBxPDUPkm1tNfF6bhTYPA7i7aF4lZJVr+OXTNNrnnIl58Wfg==",
-			"dev": true,
 			"requires": {
 				"define-properties": "^1.1.2",
 				"function-bind": "^1.1.1",
@@ -6177,8 +5626,7 @@
 		"functional-red-black-tree": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-			"integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
-			"dev": true
+			"integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc="
 		},
 		"gauge": {
 			"version": "2.7.4",
@@ -6219,7 +5667,6 @@
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.2.tgz",
 			"integrity": "sha1-hHIkZ3rbiHDWeSV+0ziP22HkAQU=",
-			"dev": true,
 			"requires": {
 				"globule": "^1.0.0"
 			}
@@ -6332,14 +5779,12 @@
 		"get-value": {
 			"version": "2.0.6",
 			"resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
-			"integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
-			"dev": true
+			"integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg="
 		},
 		"getpass": {
 			"version": "0.1.7",
 			"resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
 			"integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-			"dev": true,
 			"requires": {
 				"assert-plus": "^1.0.0"
 			}
@@ -6357,7 +5802,6 @@
 			"version": "6.0.0",
 			"resolved": "https://registry.npmjs.org/gh-got/-/gh-got-6.0.0.tgz",
 			"integrity": "sha512-F/mS+fsWQMo1zfgG9MD8KWvTWPPzzhuVwY++fhQ5Ggd+0P+CAMHtzMZhNxG+TqGfHDChJKsbh6otfMGqO2AKBw==",
-			"dev": true,
 			"requires": {
 				"got": "^7.0.0",
 				"is-plain-obj": "^1.1.0"
@@ -6367,7 +5811,6 @@
 					"version": "7.1.0",
 					"resolved": "https://registry.npmjs.org/got/-/got-7.1.0.tgz",
 					"integrity": "sha512-Y5WMo7xKKq1muPsxD+KmrR8DH5auG7fBdDVueZwETwV6VytKyU9OX/ddpq2/1hp1vIPvVb4T81dKQz3BivkNLw==",
-					"dev": true,
 					"requires": {
 						"decompress-response": "^3.2.0",
 						"duplexer3": "^0.1.4",
@@ -6388,14 +5831,12 @@
 				"p-cancelable": {
 					"version": "0.3.0",
 					"resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.3.0.tgz",
-					"integrity": "sha512-RVbZPLso8+jFeq1MfNvgXtCRED2raz/dKpacfTNxsx6pLEpEomM7gah6VeHSYV3+vo0OAi4MkArtQcWWXuQoyw==",
-					"dev": true
+					"integrity": "sha512-RVbZPLso8+jFeq1MfNvgXtCRED2raz/dKpacfTNxsx6pLEpEomM7gah6VeHSYV3+vo0OAi4MkArtQcWWXuQoyw=="
 				},
 				"p-timeout": {
 					"version": "1.2.1",
 					"resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-1.2.1.tgz",
 					"integrity": "sha1-XrOzU7f86Z8QGhA4iAuwVOu+o4Y=",
-					"dev": true,
 					"requires": {
 						"p-finally": "^1.0.0"
 					}
@@ -6451,7 +5892,6 @@
 			"version": "4.1.0",
 			"resolved": "https://registry.npmjs.org/github-username/-/github-username-4.1.0.tgz",
 			"integrity": "sha1-y+KABBiDIG2kISrp5LXxacML9Bc=",
-			"dev": true,
 			"requires": {
 				"gh-got": "^6.0.0"
 			}
@@ -6473,7 +5913,6 @@
 			"version": "3.1.0",
 			"resolved": "https://registry.npmjs.org/glob-all/-/glob-all-3.1.0.tgz",
 			"integrity": "sha1-iRPd+17hrHgSZWJBsD1SF8ZLAqs=",
-			"dev": true,
 			"requires": {
 				"glob": "^7.0.5",
 				"yargs": "~1.2.6"
@@ -6482,14 +5921,12 @@
 				"minimist": {
 					"version": "0.1.0",
 					"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.1.0.tgz",
-					"integrity": "sha1-md9lelJXTCHJBXSX33QnkLK0wN4=",
-					"dev": true
+					"integrity": "sha1-md9lelJXTCHJBXSX33QnkLK0wN4="
 				},
 				"yargs": {
 					"version": "1.2.6",
 					"resolved": "https://registry.npmjs.org/yargs/-/yargs-1.2.6.tgz",
 					"integrity": "sha1-nHtKgv1dWVsr8Xq23MQxNUMv40s=",
-					"dev": true,
 					"requires": {
 						"minimist": "^0.1.0"
 					}
@@ -6500,7 +5937,6 @@
 			"version": "0.3.0",
 			"resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
 			"integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
-			"dev": true,
 			"requires": {
 				"glob-parent": "^2.0.0",
 				"is-glob": "^2.0.0"
@@ -6510,7 +5946,6 @@
 					"version": "2.0.0",
 					"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
 					"integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
-					"dev": true,
 					"requires": {
 						"is-glob": "^2.0.0"
 					}
@@ -6518,14 +5953,12 @@
 				"is-extglob": {
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-					"integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-					"dev": true
+					"integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA="
 				},
 				"is-glob": {
 					"version": "2.0.1",
 					"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
 					"integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-					"dev": true,
 					"requires": {
 						"is-extglob": "^1.0.0"
 					}
@@ -6544,14 +5977,12 @@
 		"glob-to-regexp": {
 			"version": "0.3.0",
 			"resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz",
-			"integrity": "sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=",
-			"dev": true
+			"integrity": "sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs="
 		},
 		"global-modules": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
 			"integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
-			"dev": true,
 			"requires": {
 				"global-prefix": "^1.0.1",
 				"is-windows": "^1.0.1",
@@ -6562,7 +5993,6 @@
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
 			"integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
-			"dev": true,
 			"requires": {
 				"expand-tilde": "^2.0.2",
 				"homedir-polyfill": "^1.0.1",
@@ -6574,8 +6004,7 @@
 		"globals": {
 			"version": "9.18.0",
 			"resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
-			"integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
-			"dev": true
+			"integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ=="
 		},
 		"globby": {
 			"version": "6.1.0",
@@ -6600,7 +6029,6 @@
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/globule/-/globule-1.2.0.tgz",
 			"integrity": "sha1-HcScaCLdnoovoAuiopUAboZkvQk=",
-			"dev": true,
 			"requires": {
 				"glob": "~7.1.1",
 				"lodash": "~4.17.4",
@@ -6642,7 +6070,6 @@
 			"version": "0.3.3",
 			"resolved": "https://registry.npmjs.org/grouped-queue/-/grouped-queue-0.3.3.tgz",
 			"integrity": "sha1-wWfSpTGcWg4JZO9qJbfC34mWyFw=",
-			"dev": true,
 			"requires": {
 				"lodash": "^4.17.2"
 			}
@@ -6650,8 +6077,7 @@
 		"growly": {
 			"version": "1.3.0",
 			"resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz",
-			"integrity": "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=",
-			"dev": true
+			"integrity": "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE="
 		},
 		"handlebars": {
 			"version": "4.0.11",
@@ -6667,14 +6093,12 @@
 		"har-schema": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-			"integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
-			"dev": true
+			"integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
 		},
 		"har-validator": {
 			"version": "5.0.3",
 			"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
 			"integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
-			"dev": true,
 			"requires": {
 				"ajv": "^5.1.0",
 				"har-schema": "^2.0.0"
@@ -6684,7 +6108,6 @@
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/has/-/has-1.0.1.tgz",
 			"integrity": "sha1-hGFzP1OLCDfJNh45qauelwTcLyg=",
-			"dev": true,
 			"requires": {
 				"function-bind": "^1.0.2"
 			}
@@ -6693,7 +6116,6 @@
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
 			"integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-			"dev": true,
 			"requires": {
 				"ansi-regex": "^2.0.0"
 			}
@@ -6701,8 +6123,7 @@
 		"has-color": {
 			"version": "0.1.7",
 			"resolved": "https://registry.npmjs.org/has-color/-/has-color-0.1.7.tgz",
-			"integrity": "sha1-ZxRKUmDDT8PMpnfQQdr1L+e3iy8=",
-			"dev": true
+			"integrity": "sha1-ZxRKUmDDT8PMpnfQQdr1L+e3iy8="
 		},
 		"has-flag": {
 			"version": "3.0.0",
@@ -6712,20 +6133,17 @@
 		"has-symbol-support-x": {
 			"version": "1.4.2",
 			"resolved": "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz",
-			"integrity": "sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==",
-			"dev": true
+			"integrity": "sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw=="
 		},
 		"has-symbols": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz",
-			"integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=",
-			"dev": true
+			"integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q="
 		},
 		"has-to-string-tag-x": {
 			"version": "1.4.1",
 			"resolved": "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz",
 			"integrity": "sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==",
-			"dev": true,
 			"requires": {
 				"has-symbol-support-x": "^1.4.1"
 			}
@@ -6739,7 +6157,6 @@
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
 			"integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
-			"dev": true,
 			"requires": {
 				"get-value": "^2.0.6",
 				"has-values": "^1.0.0",
@@ -6750,7 +6167,6 @@
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
 			"integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
-			"dev": true,
 			"requires": {
 				"is-number": "^3.0.0",
 				"kind-of": "^4.0.0"
@@ -6760,7 +6176,6 @@
 					"version": "4.0.0",
 					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
 					"integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
-					"dev": true,
 					"requires": {
 						"is-buffer": "^1.1.5"
 					}
@@ -6771,7 +6186,6 @@
 			"version": "3.0.4",
 			"resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
 			"integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
-			"dev": true,
 			"requires": {
 				"inherits": "^2.0.1",
 				"safe-buffer": "^5.0.1"
@@ -6781,7 +6195,6 @@
 			"version": "1.1.3",
 			"resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz",
 			"integrity": "sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==",
-			"dev": true,
 			"requires": {
 				"inherits": "^2.0.3",
 				"minimalistic-assert": "^1.0.0"
@@ -6791,7 +6204,6 @@
 			"version": "6.0.2",
 			"resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz",
 			"integrity": "sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==",
-			"dev": true,
 			"requires": {
 				"boom": "4.x.x",
 				"cryptiles": "3.x.x",
@@ -6803,7 +6215,6 @@
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
 			"integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
-			"dev": true,
 			"requires": {
 				"hash.js": "^1.0.3",
 				"minimalistic-assert": "^1.0.0",
@@ -6813,8 +6224,7 @@
 		"hoek": {
 			"version": "4.2.1",
 			"resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz",
-			"integrity": "sha512-QLg82fGkfnJ/4iy1xZ81/9SIJiq1NGFUMGs6ParyjBZr6jW2Ufj/snDqTHixNlHdPNwN2RLVD0Pi3igeK9+JfA==",
-			"dev": true
+			"integrity": "sha512-QLg82fGkfnJ/4iy1xZ81/9SIJiq1NGFUMGs6ParyjBZr6jW2Ufj/snDqTHixNlHdPNwN2RLVD0Pi3igeK9+JfA=="
 		},
 		"hoist-non-react-statics": {
 			"version": "1.2.0",
@@ -6825,7 +6235,6 @@
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz",
 			"integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=",
-			"dev": true,
 			"requires": {
 				"os-homedir": "^1.0.0",
 				"os-tmpdir": "^1.0.1"
@@ -6835,7 +6244,6 @@
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz",
 			"integrity": "sha1-TCu8inWJmP7r9e1oWA921GdotLw=",
-			"dev": true,
 			"requires": {
 				"parse-passwd": "^1.0.0"
 			}
@@ -6853,14 +6261,12 @@
 		"html-comment-regex": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.1.tgz",
-			"integrity": "sha1-ZouTd26q5V696POtRkswekljYl4=",
-			"dev": true
+			"integrity": "sha1-ZouTd26q5V696POtRkswekljYl4="
 		},
 		"html-encoding-sniffer": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz",
 			"integrity": "sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==",
-			"dev": true,
 			"requires": {
 				"whatwg-encoding": "^1.0.1"
 			}
@@ -6869,7 +6275,6 @@
 			"version": "3.9.2",
 			"resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.2.tgz",
 			"integrity": "sha1-G9+HrMoPP55T+k/M6w9LTLsAszg=",
-			"dev": true,
 			"requires": {
 				"domelementtype": "^1.3.0",
 				"domhandler": "^2.3.0",
@@ -6879,23 +6284,25 @@
 				"readable-stream": "^2.0.2"
 			}
 		},
+		"http-build-query": {
+			"version": "0.7.0",
+			"resolved": "https://registry.npmjs.org/http-build-query/-/http-build-query-0.7.0.tgz",
+			"integrity": "sha512-r5jnQ/PcKzFg2dLJAj9xU8cBHuLubxLli6NiFtziNrDqVwPcjIgioamZszzGOPJq6ekUu+WfIcgsuPqe9MX4Ag=="
+		},
 		"http-cache-semantics": {
 			"version": "3.8.1",
 			"resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz",
-			"integrity": "sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==",
-			"dev": true
+			"integrity": "sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w=="
 		},
 		"http-parser-js": {
 			"version": "0.4.13",
 			"resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.13.tgz",
-			"integrity": "sha1-O9bW/ebjFyyTNMOzO2wZPYD+ETc=",
-			"dev": true
+			"integrity": "sha1-O9bW/ebjFyyTNMOzO2wZPYD+ETc="
 		},
 		"http-signature": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
 			"integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
-			"dev": true,
 			"requires": {
 				"assert-plus": "^1.0.0",
 				"jsprim": "^1.2.2",
@@ -6905,14 +6312,12 @@
 		"https-browserify": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
-			"integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=",
-			"dev": true
+			"integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM="
 		},
 		"https-proxy-agent": {
 			"version": "2.2.1",
 			"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz",
 			"integrity": "sha512-HPCTS1LW51bcyMYbxUIOO4HEOlQ1/1qRaFWcyxvwaqUS9TY88aoEuHUY33kuAh1YhVVaDQhLZsnPd+XNARWZlQ==",
-			"dev": true,
 			"requires": {
 				"agent-base": "^4.1.0",
 				"debug": "^3.1.0"
@@ -6922,7 +6327,6 @@
 					"version": "3.1.0",
 					"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
 					"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-					"dev": true,
 					"requires": {
 						"ms": "2.0.0"
 					}
@@ -6940,14 +6344,12 @@
 		"ieee754": {
 			"version": "1.1.11",
 			"resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.11.tgz",
-			"integrity": "sha512-VhDzCKN7K8ufStx/CLj5/PDTMgph+qwN5Pkd5i0sGnVwk56zJ0lkT8Qzi1xqWLS0Wp29DgDtNeS7v8/wMoZeHg==",
-			"dev": true
+			"integrity": "sha512-VhDzCKN7K8ufStx/CLj5/PDTMgph+qwN5Pkd5i0sGnVwk56zJ0lkT8Qzi1xqWLS0Wp29DgDtNeS7v8/wMoZeHg=="
 		},
 		"iferr": {
 			"version": "0.1.5",
 			"resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz",
-			"integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=",
-			"dev": true
+			"integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE="
 		},
 		"ignore": {
 			"version": "3.3.8",
@@ -6958,7 +6360,6 @@
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/import-local/-/import-local-1.0.0.tgz",
 			"integrity": "sha512-vAaZHieK9qjGo58agRBg+bhHX3hoTZU/Oa3GESWLz7t1U62fk63aHuDJJEteXoDeTCcPmUT+z38gkHPZkkmpmQ==",
-			"dev": true,
 			"requires": {
 				"pkg-dir": "^2.0.0",
 				"resolve-cwd": "^2.0.0"
@@ -6972,8 +6373,7 @@
 		"in-publish": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.0.tgz",
-			"integrity": "sha1-4g/146KvwmkDILbcVSaCqcf631E=",
-			"dev": true
+			"integrity": "sha1-4g/146KvwmkDILbcVSaCqcf631E="
 		},
 		"indent-string": {
 			"version": "3.2.0",
@@ -6983,14 +6383,12 @@
 		"indexes-of": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz",
-			"integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=",
-			"dev": true
+			"integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc="
 		},
 		"indexof": {
 			"version": "0.0.1",
 			"resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz",
-			"integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=",
-			"dev": true
+			"integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10="
 		},
 		"inflight": {
 			"version": "1.0.6",
@@ -7050,14 +6448,12 @@
 		"interpret": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz",
-			"integrity": "sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=",
-			"dev": true
+			"integrity": "sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ="
 		},
 		"into-stream": {
 			"version": "3.1.0",
 			"resolved": "https://registry.npmjs.org/into-stream/-/into-stream-3.1.0.tgz",
 			"integrity": "sha1-lvsKk2wSur1v8XUqF9BWFqvQlMY=",
-			"dev": true,
 			"requires": {
 				"from2": "^2.1.1",
 				"p-is-promise": "^1.1.0"
@@ -7067,7 +6463,6 @@
 			"version": "2.2.4",
 			"resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
 			"integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
-			"dev": true,
 			"requires": {
 				"loose-envify": "^1.0.0"
 			}
@@ -7080,20 +6475,17 @@
 		"irregular-plurals": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-2.0.0.tgz",
-			"integrity": "sha512-Y75zBYLkh0lJ9qxeHlMjQ7bSbyiSqNW/UOPWDmzC7cXskL1hekSITh1Oc6JV0XCWWZ9DE8VYSB71xocLk3gmGw==",
-			"dev": true
+			"integrity": "sha512-Y75zBYLkh0lJ9qxeHlMjQ7bSbyiSqNW/UOPWDmzC7cXskL1hekSITh1Oc6JV0XCWWZ9DE8VYSB71xocLk3gmGw=="
 		},
 		"is-absolute-url": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz",
-			"integrity": "sha1-UFMN+4T8yap9vnhS6Do3uTufKqY=",
-			"dev": true
+			"integrity": "sha1-UFMN+4T8yap9vnhS6Do3uTufKqY="
 		},
 		"is-accessor-descriptor": {
 			"version": "0.1.6",
 			"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
 			"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-			"dev": true,
 			"requires": {
 				"kind-of": "^3.0.2"
 			}
@@ -7107,7 +6499,6 @@
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
 			"integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
-			"dev": true,
 			"requires": {
 				"binary-extensions": "^1.0.0"
 			}
@@ -7115,8 +6506,7 @@
 		"is-boolean-object": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.0.0.tgz",
-			"integrity": "sha1-mPiygDBoQhmpXzdc+9iM40Bd/5M=",
-			"dev": true
+			"integrity": "sha1-mPiygDBoQhmpXzdc+9iM40Bd/5M="
 		},
 		"is-buffer": {
 			"version": "1.1.6",
@@ -7134,8 +6524,7 @@
 		"is-callable": {
 			"version": "1.1.3",
 			"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.3.tgz",
-			"integrity": "sha1-hut1OSgF3cM69xySoO7fdO52BLI=",
-			"dev": true
+			"integrity": "sha1-hut1OSgF3cM69xySoO7fdO52BLI="
 		},
 		"is-ci": {
 			"version": "1.1.0",
@@ -7149,7 +6538,6 @@
 			"version": "0.1.4",
 			"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
 			"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-			"dev": true,
 			"requires": {
 				"kind-of": "^3.0.2"
 			}
@@ -7157,14 +6545,12 @@
 		"is-date-object": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
-			"integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=",
-			"dev": true
+			"integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY="
 		},
 		"is-descriptor": {
 			"version": "0.1.6",
 			"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
 			"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-			"dev": true,
 			"requires": {
 				"is-accessor-descriptor": "^0.1.6",
 				"is-data-descriptor": "^0.1.4",
@@ -7174,28 +6560,24 @@
 				"kind-of": {
 					"version": "5.1.0",
 					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-					"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-					"dev": true
+					"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="
 				}
 			}
 		},
 		"is-directory": {
 			"version": "0.3.1",
 			"resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz",
-			"integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=",
-			"dev": true
+			"integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE="
 		},
 		"is-dotfile": {
 			"version": "1.0.3",
 			"resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz",
-			"integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=",
-			"dev": true
+			"integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE="
 		},
 		"is-equal-shallow": {
 			"version": "0.1.3",
 			"resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
 			"integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=",
-			"dev": true,
 			"requires": {
 				"is-primitive": "^2.0.0"
 			}
@@ -7203,8 +6585,7 @@
 		"is-extendable": {
 			"version": "0.1.1",
 			"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-			"integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-			"dev": true
+			"integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik="
 		},
 		"is-extglob": {
 			"version": "2.1.1",
@@ -7227,8 +6608,7 @@
 		"is-generator-fn": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-1.0.0.tgz",
-			"integrity": "sha1-lp1J4bszKfa7fwkIm+JleLLd1Go=",
-			"dev": true
+			"integrity": "sha1-lp1J4bszKfa7fwkIm+JleLLd1Go="
 		},
 		"is-glob": {
 			"version": "3.1.0",
@@ -7242,7 +6622,6 @@
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
 			"integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-			"dev": true,
 			"requires": {
 				"kind-of": "^3.0.2"
 			}
@@ -7250,8 +6629,7 @@
 		"is-number-object": {
 			"version": "1.0.3",
 			"resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.3.tgz",
-			"integrity": "sha1-8mWrian0RQNO9q/xWo8AsA9VF5k=",
-			"dev": true
+			"integrity": "sha1-8mWrian0RQNO9q/xWo8AsA9VF5k="
 		},
 		"is-obj": {
 			"version": "1.0.1",
@@ -7261,14 +6639,12 @@
 		"is-object": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz",
-			"integrity": "sha1-iVJojF7C/9awPsyF52ngKQMINHA=",
-			"dev": true
+			"integrity": "sha1-iVJojF7C/9awPsyF52ngKQMINHA="
 		},
 		"is-observable": {
 			"version": "0.2.0",
 			"resolved": "https://registry.npmjs.org/is-observable/-/is-observable-0.2.0.tgz",
 			"integrity": "sha1-s2ExHYPG5dcmyr9eJQsCNxBvWuI=",
-			"dev": true,
 			"requires": {
 				"symbol-observable": "^0.2.2"
 			},
@@ -7276,8 +6652,7 @@
 				"symbol-observable": {
 					"version": "0.2.4",
 					"resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-0.2.4.tgz",
-					"integrity": "sha1-lag9smGG1q9+ehjb2XYKL4bQj0A=",
-					"dev": true
+					"integrity": "sha1-lag9smGG1q9+ehjb2XYKL4bQj0A="
 				}
 			}
 		},
@@ -7285,7 +6660,6 @@
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/is-odd/-/is-odd-2.0.0.tgz",
 			"integrity": "sha512-OTiixgpZAT1M4NHgS5IguFp/Vz2VI3U7Goh4/HA1adtwyLtSBrxYlcSYkhpAE07s4fKEcjrFxyvtQBND4vFQyQ==",
-			"dev": true,
 			"requires": {
 				"is-number": "^4.0.0"
 			},
@@ -7293,22 +6667,19 @@
 				"is-number": {
 					"version": "4.0.0",
 					"resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
-					"integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
-					"dev": true
+					"integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ=="
 				}
 			}
 		},
 		"is-path-cwd": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
-			"integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=",
-			"dev": true
+			"integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0="
 		},
 		"is-path-in-cwd": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz",
 			"integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==",
-			"dev": true,
 			"requires": {
 				"is-path-inside": "^1.0.0"
 			}
@@ -7317,7 +6688,6 @@
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz",
 			"integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
-			"dev": true,
 			"requires": {
 				"path-is-inside": "^1.0.1"
 			}
@@ -7331,7 +6701,6 @@
 			"version": "2.0.4",
 			"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
 			"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-			"dev": true,
 			"requires": {
 				"isobject": "^3.0.1"
 			}
@@ -7339,14 +6708,12 @@
 		"is-posix-bracket": {
 			"version": "0.1.1",
 			"resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz",
-			"integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=",
-			"dev": true
+			"integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q="
 		},
 		"is-primitive": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
-			"integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=",
-			"dev": true
+			"integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU="
 		},
 		"is-promise": {
 			"version": "2.1.0",
@@ -7362,7 +6729,6 @@
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
 			"integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
-			"dev": true,
 			"requires": {
 				"has": "^1.0.1"
 			}
@@ -7370,8 +6736,7 @@
 		"is-resolvable": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
-			"integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==",
-			"dev": true
+			"integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg=="
 		},
 		"is-retry-allowed": {
 			"version": "1.1.0",
@@ -7382,7 +6747,6 @@
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/is-scoped/-/is-scoped-1.0.0.tgz",
 			"integrity": "sha1-RJypgpnnEwOCViieyytUDcQ3yzA=",
-			"dev": true,
 			"requires": {
 				"scoped-regex": "^1.0.0"
 			}
@@ -7395,8 +6759,7 @@
 		"is-string": {
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.4.tgz",
-			"integrity": "sha1-zDqbaYV9Yh6WNyWiTK7shzuCbmQ=",
-			"dev": true
+			"integrity": "sha1-zDqbaYV9Yh6WNyWiTK7shzuCbmQ="
 		},
 		"is-subset": {
 			"version": "0.1.1",
@@ -7407,7 +6770,6 @@
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/is-svg/-/is-svg-2.1.0.tgz",
 			"integrity": "sha1-z2EJDaDZ77yrhyLeum8DIgjbsOk=",
-			"dev": true,
 			"requires": {
 				"html-comment-regex": "^1.1.0"
 			}
@@ -7415,8 +6777,7 @@
 		"is-symbol": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz",
-			"integrity": "sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI=",
-			"dev": true
+			"integrity": "sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI="
 		},
 		"is-text-path": {
 			"version": "1.0.1",
@@ -7429,8 +6790,7 @@
 		"is-typedarray": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-			"integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-			"dev": true
+			"integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
 		},
 		"is-utf8": {
 			"version": "0.2.1",
@@ -7440,8 +6800,7 @@
 		"is-windows": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
-			"integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
-			"dev": true
+			"integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="
 		},
 		"isarray": {
 			"version": "1.0.0",
@@ -7451,8 +6810,7 @@
 		"isbinaryfile": {
 			"version": "3.0.2",
 			"resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.2.tgz",
-			"integrity": "sha1-Sj6XTsDLqQBNP8bN5yCeppNopiE=",
-			"dev": true
+			"integrity": "sha1-Sj6XTsDLqQBNP8bN5yCeppNopiE="
 		},
 		"isexe": {
 			"version": "2.0.0",
@@ -7462,8 +6820,7 @@
 		"isobject": {
 			"version": "3.0.1",
 			"resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-			"integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-			"dev": true
+			"integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
 		},
 		"isomorphic-fetch": {
 			"version": "2.2.1",
@@ -7477,14 +6834,12 @@
 		"isstream": {
 			"version": "0.1.2",
 			"resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-			"integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
-			"dev": true
+			"integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
 		},
 		"istanbul-api": {
 			"version": "1.3.1",
 			"resolved": "https://registry.npmjs.org/istanbul-api/-/istanbul-api-1.3.1.tgz",
 			"integrity": "sha512-duj6AlLcsWNwUpfyfHt0nWIeRiZpuShnP40YTxOGQgtaN8fd6JYSxsvxUphTDy8V5MfDXo4s/xVCIIvVCO808g==",
-			"dev": true,
 			"requires": {
 				"async": "^2.1.4",
 				"compare-versions": "^3.1.0",
@@ -7504,7 +6859,6 @@
 					"version": "2.6.1",
 					"resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz",
 					"integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==",
-					"dev": true,
 					"requires": {
 						"lodash": "^4.17.10"
 					}
@@ -7513,7 +6867,6 @@
 					"version": "3.1.0",
 					"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
 					"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-					"dev": true,
 					"requires": {
 						"ms": "2.0.0"
 					}
@@ -7522,7 +6875,6 @@
 					"version": "1.2.4",
 					"resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.4.tgz",
 					"integrity": "sha512-UzuK0g1wyQijiaYQxj/CdNycFhAd2TLtO2obKQMTZrZ1jzEMRY3rvpASEKkaxbRR6brvdovfA03znPa/pXcejg==",
-					"dev": true,
 					"requires": {
 						"debug": "^3.1.0",
 						"istanbul-lib-coverage": "^1.2.0",
@@ -7534,28 +6886,24 @@
 				"lodash": {
 					"version": "4.17.10",
 					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz",
-					"integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==",
-					"dev": true
+					"integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg=="
 				},
 				"source-map": {
 					"version": "0.5.7",
 					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-					"dev": true
+					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
 				}
 			}
 		},
 		"istanbul-lib-coverage": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.0.tgz",
-			"integrity": "sha512-GvgM/uXRwm+gLlvkWHTjDAvwynZkL9ns15calTrmhGgowlwJBbWMYzWbKqE2DT6JDP1AFXKa+Zi0EkqNCUqY0A==",
-			"dev": true
+			"integrity": "sha512-GvgM/uXRwm+gLlvkWHTjDAvwynZkL9ns15calTrmhGgowlwJBbWMYzWbKqE2DT6JDP1AFXKa+Zi0EkqNCUqY0A=="
 		},
 		"istanbul-lib-hook": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-1.2.0.tgz",
 			"integrity": "sha512-p3En6/oGkFQV55Up8ZPC2oLxvgSxD8CzA0yBrhRZSh3pfv3OFj9aSGVC0yoerAi/O4u7jUVnOGVX1eVFM+0tmQ==",
-			"dev": true,
 			"requires": {
 				"append-transform": "^0.4.0"
 			}
@@ -7564,7 +6912,6 @@
 			"version": "1.10.1",
 			"resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.1.tgz",
 			"integrity": "sha512-1dYuzkOCbuR5GRJqySuZdsmsNKPL3PTuyPevQfoCXJePT9C8y1ga75neU+Tuy9+yS3G/dgx8wgOmp2KLpgdoeQ==",
-			"dev": true,
 			"requires": {
 				"babel-generator": "^6.18.0",
 				"babel-template": "^6.16.0",
@@ -7579,7 +6926,6 @@
 			"version": "1.1.4",
 			"resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-1.1.4.tgz",
 			"integrity": "sha512-Azqvq5tT0U09nrncK3q82e/Zjkxa4tkFZv7E6VcqP0QCPn6oNljDPfrZEC/umNXds2t7b8sRJfs6Kmpzt8m2kA==",
-			"dev": true,
 			"requires": {
 				"istanbul-lib-coverage": "^1.2.0",
 				"mkdirp": "^0.5.1",
@@ -7590,14 +6936,12 @@
 				"has-flag": {
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-					"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-					"dev": true
+					"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
 				},
 				"supports-color": {
 					"version": "3.2.3",
 					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
 					"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-					"dev": true,
 					"requires": {
 						"has-flag": "^1.0.0"
 					}
@@ -7608,7 +6952,6 @@
 			"version": "1.2.3",
 			"resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.3.tgz",
 			"integrity": "sha512-fDa0hwU/5sDXwAklXgAoCJCOsFsBplVQ6WBldz5UwaqOzmDhUK4nfuR7/G//G2lERlblUNJB8P6e8cXq3a7MlA==",
-			"dev": true,
 			"requires": {
 				"debug": "^3.1.0",
 				"istanbul-lib-coverage": "^1.1.2",
@@ -7621,7 +6964,6 @@
 					"version": "3.1.0",
 					"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
 					"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-					"dev": true,
 					"requires": {
 						"ms": "2.0.0"
 					}
@@ -7629,8 +6971,7 @@
 				"source-map": {
 					"version": "0.5.7",
 					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-					"dev": true
+					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
 				}
 			}
 		},
@@ -7638,7 +6979,6 @@
 			"version": "1.3.0",
 			"resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-1.3.0.tgz",
 			"integrity": "sha512-y2Z2IMqE1gefWUaVjrBm0mSKvUkaBy9Vqz8iwr/r40Y9hBbIteH5wqHG/9DLTfJ9xUnUT2j7A3+VVJ6EaYBllA==",
-			"dev": true,
 			"requires": {
 				"handlebars": "^4.0.3"
 			}
@@ -7647,7 +6987,6 @@
 			"version": "2.2.1",
 			"resolved": "https://registry.npmjs.org/istextorbinary/-/istextorbinary-2.2.1.tgz",
 			"integrity": "sha512-TS+hoFl8Z5FAFMK38nhBkdLt44CclNRgDHWeMgsV8ko3nDlr/9UI2Sf839sW7enijf8oKsZYXRvM8g0it9Zmcw==",
-			"dev": true,
 			"requires": {
 				"binaryextensions": "2",
 				"editions": "^1.3.3",
@@ -7658,7 +6997,6 @@
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz",
 			"integrity": "sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==",
-			"dev": true,
 			"requires": {
 				"has-to-string-tag-x": "^1.2.0",
 				"is-object": "^1.0.1"
@@ -7673,7 +7011,6 @@
 			"version": "22.4.4",
 			"resolved": "https://registry.npmjs.org/jest/-/jest-22.4.4.tgz",
 			"integrity": "sha512-eBhhW8OS/UuX3HxgzNBSVEVhSuRDh39Z1kdYkQVWna+scpgsrD7vSeBI7tmEvsguPDMnfJodW28YBnhv/BzSew==",
-			"dev": true,
 			"requires": {
 				"import-local": "^1.0.0",
 				"jest-cli": "^22.4.4"
@@ -7682,14 +7019,12 @@
 				"ansi-regex": {
 					"version": "3.0.0",
 					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-					"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-					"dev": true
+					"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
 				},
 				"arr-diff": {
 					"version": "2.0.0",
 					"resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
 					"integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
-					"dev": true,
 					"requires": {
 						"arr-flatten": "^1.0.1"
 					}
@@ -7697,14 +7032,12 @@
 				"array-unique": {
 					"version": "0.2.1",
 					"resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
-					"integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
-					"dev": true
+					"integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM="
 				},
 				"braces": {
 					"version": "1.8.5",
 					"resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
 					"integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
-					"dev": true,
 					"requires": {
 						"expand-range": "^1.8.1",
 						"preserve": "^0.2.0",
@@ -7714,14 +7047,12 @@
 				"camelcase": {
 					"version": "4.1.0",
 					"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
-					"integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
-					"dev": true
+					"integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0="
 				},
 				"cliui": {
 					"version": "4.1.0",
 					"resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
 					"integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
-					"dev": true,
 					"requires": {
 						"string-width": "^2.1.1",
 						"strip-ansi": "^4.0.0",
@@ -7732,7 +7063,6 @@
 					"version": "0.1.5",
 					"resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
 					"integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
-					"dev": true,
 					"requires": {
 						"is-posix-bracket": "^0.1.0"
 					}
@@ -7741,7 +7071,6 @@
 					"version": "0.3.2",
 					"resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
 					"integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
-					"dev": true,
 					"requires": {
 						"is-extglob": "^1.0.0"
 					}
@@ -7749,14 +7078,12 @@
 				"is-extglob": {
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-					"integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-					"dev": true
+					"integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA="
 				},
 				"is-glob": {
 					"version": "2.0.1",
 					"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
 					"integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-					"dev": true,
 					"requires": {
 						"is-extglob": "^1.0.0"
 					}
@@ -7765,7 +7092,6 @@
 					"version": "22.4.4",
 					"resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-22.4.4.tgz",
 					"integrity": "sha512-I9dsgkeyjVEEZj9wrGrqlH+8OlNob9Iptyl+6L5+ToOLJmHm4JwOPatin1b2Bzp5R5YRQJ+oiedx7o1H7wJzhA==",
-					"dev": true,
 					"requires": {
 						"ansi-escapes": "^3.0.0",
 						"chalk": "^2.0.1",
@@ -7807,7 +7133,6 @@
 					"version": "2.3.11",
 					"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
 					"integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
-					"dev": true,
 					"requires": {
 						"arr-diff": "^2.0.0",
 						"array-unique": "^0.2.1",
@@ -7828,7 +7153,6 @@
 					"version": "4.0.0",
 					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
 					"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-					"dev": true,
 					"requires": {
 						"ansi-regex": "^3.0.0"
 					}
@@ -7837,7 +7161,6 @@
 					"version": "10.1.2",
 					"resolved": "https://registry.npmjs.org/yargs/-/yargs-10.1.2.tgz",
 					"integrity": "sha512-ivSoxqBGYOqQVruxD35+EyCFDYNEFL/Uo6FcOnz+9xZdZzK0Zzw4r4KhbrME1Oo2gOggwJod2MnsdamSG7H9ig==",
-					"dev": true,
 					"requires": {
 						"cliui": "^4.0.0",
 						"decamelize": "^1.1.1",
@@ -7857,7 +7180,6 @@
 					"version": "8.1.0",
 					"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-8.1.0.tgz",
 					"integrity": "sha512-yP+6QqN8BmrgW2ggLtTbdrOyBNSI7zBa4IykmiV5R1wl1JWNxQvWhMfMdmzIYtKU7oP3OOInY/tl2ov3BDjnJQ==",
-					"dev": true,
 					"requires": {
 						"camelcase": "^4.1.0"
 					}
@@ -7868,7 +7190,6 @@
 			"version": "22.4.3",
 			"resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-22.4.3.tgz",
 			"integrity": "sha512-83Dh0w1aSkUNFhy5d2dvqWxi/y6weDwVVLU6vmK0cV9VpRxPzhTeGimbsbRDSnEoszhF937M4sDLLeS7Cu/Tmw==",
-			"dev": true,
 			"requires": {
 				"throat": "^4.0.0"
 			}
@@ -7877,7 +7198,6 @@
 			"version": "22.4.4",
 			"resolved": "https://registry.npmjs.org/jest-config/-/jest-config-22.4.4.tgz",
 			"integrity": "sha512-9CKfo1GC4zrXSoMLcNeDvQBfgtqGTB1uP8iDIZ97oB26RCUb886KkKWhVcpyxVDOUxbhN+uzcBCeFe7w+Iem4A==",
-			"dev": true,
 			"requires": {
 				"chalk": "^2.0.1",
 				"glob": "^7.1.1",
@@ -7896,7 +7216,6 @@
 			"version": "22.4.3",
 			"resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-22.4.3.tgz",
 			"integrity": "sha512-/QqGvCDP5oZOF6PebDuLwrB2BMD8ffJv6TAGAdEVuDx1+uEgrHpSFrfrOiMRx2eJ1hgNjlQrOQEHetVwij90KA==",
-			"dev": true,
 			"requires": {
 				"chalk": "^2.0.1",
 				"diff": "^3.2.0",
@@ -7908,7 +7227,6 @@
 			"version": "22.4.3",
 			"resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-22.4.3.tgz",
 			"integrity": "sha512-uPKBEAw7YrEMcXueMKZXn/rbMxBiSv48fSqy3uEnmgOlQhSX+lthBqHb1fKWNVmFqAp9E/RsSdBfiV31LbzaOg==",
-			"dev": true,
 			"requires": {
 				"detect-newline": "^2.1.0"
 			}
@@ -7917,7 +7235,6 @@
 			"version": "22.4.3",
 			"resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-22.4.3.tgz",
 			"integrity": "sha512-FviwfR+VyT3Datf13+ULjIMO5CSeajlayhhYQwpzgunswoaLIPutdbrnfUHEMyJCwvqQFaVtTmn9+Y8WCt6n1w==",
-			"dev": true,
 			"requires": {
 				"jest-mock": "^22.4.3",
 				"jest-util": "^22.4.3",
@@ -7928,7 +7245,6 @@
 			"version": "22.4.3",
 			"resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-22.4.3.tgz",
 			"integrity": "sha512-reZl8XF6t/lMEuPWwo9OLfttyC26A5AMgDyEQ6DBgZuyfyeNUzYT8BFo6uxCCP/Av/b7eb9fTi3sIHFPBzmlRA==",
-			"dev": true,
 			"requires": {
 				"jest-mock": "^22.4.3",
 				"jest-util": "^22.4.3"
@@ -7938,7 +7254,6 @@
 			"version": "4.2.0",
 			"resolved": "https://registry.npmjs.org/jest-enzyme/-/jest-enzyme-4.2.0.tgz",
 			"integrity": "sha512-nna99NnU6sDbWqVX0153c81RUuxI/spTgw4Xobh049NcKihu0OAtAawbuSzZUnlCqdZOoXlKMudfjUPm0sCTsg==",
-			"dev": true,
 			"requires": {
 				"enzyme-matchers": "^4.2.0",
 				"enzyme-to-json": "^3.3.0"
@@ -7947,14 +7262,12 @@
 		"jest-get-type": {
 			"version": "22.4.3",
 			"resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-22.4.3.tgz",
-			"integrity": "sha512-/jsz0Y+V29w1chdXVygEKSz2nBoHoYqNShPe+QgxSNjAuP1i8+k4LbQNrfoliKej0P45sivkSCh7yiD6ubHS3w==",
-			"dev": true
+			"integrity": "sha512-/jsz0Y+V29w1chdXVygEKSz2nBoHoYqNShPe+QgxSNjAuP1i8+k4LbQNrfoliKej0P45sivkSCh7yiD6ubHS3w=="
 		},
 		"jest-haste-map": {
 			"version": "22.4.3",
 			"resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-22.4.3.tgz",
 			"integrity": "sha512-4Q9fjzuPVwnaqGKDpIsCSoTSnG3cteyk2oNVjBX12HHOaF1oxql+uUiqZb5Ndu7g/vTZfdNwwy4WwYogLh29DQ==",
-			"dev": true,
 			"requires": {
 				"fb-watchman": "^2.0.0",
 				"graceful-fs": "^4.1.11",
@@ -7969,7 +7282,6 @@
 					"version": "2.0.0",
 					"resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
 					"integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
-					"dev": true,
 					"requires": {
 						"arr-flatten": "^1.0.1"
 					}
@@ -7977,14 +7289,12 @@
 				"array-unique": {
 					"version": "0.2.1",
 					"resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
-					"integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
-					"dev": true
+					"integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM="
 				},
 				"braces": {
 					"version": "1.8.5",
 					"resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
 					"integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
-					"dev": true,
 					"requires": {
 						"expand-range": "^1.8.1",
 						"preserve": "^0.2.0",
@@ -7995,7 +7305,6 @@
 					"version": "0.1.5",
 					"resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
 					"integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
-					"dev": true,
 					"requires": {
 						"is-posix-bracket": "^0.1.0"
 					}
@@ -8004,7 +7313,6 @@
 					"version": "0.3.2",
 					"resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
 					"integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
-					"dev": true,
 					"requires": {
 						"is-extglob": "^1.0.0"
 					}
@@ -8012,14 +7320,12 @@
 				"is-extglob": {
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-					"integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-					"dev": true
+					"integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA="
 				},
 				"is-glob": {
 					"version": "2.0.1",
 					"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
 					"integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-					"dev": true,
 					"requires": {
 						"is-extglob": "^1.0.0"
 					}
@@ -8028,7 +7334,6 @@
 					"version": "2.3.11",
 					"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
 					"integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
-					"dev": true,
 					"requires": {
 						"arr-diff": "^2.0.0",
 						"array-unique": "^0.2.1",
@@ -8051,7 +7356,6 @@
 			"version": "22.4.4",
 			"resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-22.4.4.tgz",
 			"integrity": "sha512-nK3vdUl50MuH7vj/8at7EQVjPGWCi3d5+6aCi7Gxy/XMWdOdbH1qtO/LjKbqD8+8dUAEH+BVVh7HkjpCWC1CSw==",
-			"dev": true,
 			"requires": {
 				"chalk": "^2.0.1",
 				"co": "^4.6.0",
@@ -8070,7 +7374,6 @@
 			"version": "22.4.3",
 			"resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-22.4.3.tgz",
 			"integrity": "sha512-NZpR/Ls7+ndO57LuXROdgCGz2RmUdC541tTImL9bdUtU3WadgFGm0yV+Ok4Fuia/1rLAn5KaJ+i76L6e3zGJYQ==",
-			"dev": true,
 			"requires": {
 				"pretty-format": "^22.4.3"
 			}
@@ -8079,7 +7382,6 @@
 			"version": "22.4.3",
 			"resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-22.4.3.tgz",
 			"integrity": "sha512-lsEHVaTnKzdAPR5t4B6OcxXo9Vy4K+kRRbG5gtddY8lBEC+Mlpvm1CJcsMESRjzUhzkz568exMV1hTB76nAKbA==",
-			"dev": true,
 			"requires": {
 				"chalk": "^2.0.1",
 				"jest-get-type": "^22.4.3",
@@ -8090,7 +7392,6 @@
 			"version": "22.4.3",
 			"resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-22.4.3.tgz",
 			"integrity": "sha512-iAMeKxhB3Se5xkSjU0NndLLCHtP4n+GtCqV0bISKA5dmOXQfEbdEmYiu2qpnWBDCQdEafNDDU6Q+l6oBMd/+BA==",
-			"dev": true,
 			"requires": {
 				"@babel/code-frame": "^7.0.0-beta.35",
 				"chalk": "^2.0.1",
@@ -8103,7 +7404,6 @@
 					"version": "2.0.0",
 					"resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
 					"integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
-					"dev": true,
 					"requires": {
 						"arr-flatten": "^1.0.1"
 					}
@@ -8111,14 +7411,12 @@
 				"array-unique": {
 					"version": "0.2.1",
 					"resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
-					"integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
-					"dev": true
+					"integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM="
 				},
 				"braces": {
 					"version": "1.8.5",
 					"resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
 					"integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
-					"dev": true,
 					"requires": {
 						"expand-range": "^1.8.1",
 						"preserve": "^0.2.0",
@@ -8129,7 +7427,6 @@
 					"version": "0.1.5",
 					"resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
 					"integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
-					"dev": true,
 					"requires": {
 						"is-posix-bracket": "^0.1.0"
 					}
@@ -8138,7 +7435,6 @@
 					"version": "0.3.2",
 					"resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
 					"integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
-					"dev": true,
 					"requires": {
 						"is-extglob": "^1.0.0"
 					}
@@ -8146,14 +7442,12 @@
 				"is-extglob": {
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-					"integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-					"dev": true
+					"integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA="
 				},
 				"is-glob": {
 					"version": "2.0.1",
 					"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
 					"integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-					"dev": true,
 					"requires": {
 						"is-extglob": "^1.0.0"
 					}
@@ -8162,7 +7456,6 @@
 					"version": "2.3.11",
 					"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
 					"integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
-					"dev": true,
 					"requires": {
 						"arr-diff": "^2.0.0",
 						"array-unique": "^0.2.1",
@@ -8184,20 +7477,17 @@
 		"jest-mock": {
 			"version": "22.4.3",
 			"resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-22.4.3.tgz",
-			"integrity": "sha512-+4R6mH5M1G4NK16CKg9N1DtCaFmuxhcIqF4lQK/Q1CIotqMs/XBemfpDPeVZBFow6iyUNu6EBT9ugdNOTT5o5Q==",
-			"dev": true
+			"integrity": "sha512-+4R6mH5M1G4NK16CKg9N1DtCaFmuxhcIqF4lQK/Q1CIotqMs/XBemfpDPeVZBFow6iyUNu6EBT9ugdNOTT5o5Q=="
 		},
 		"jest-regex-util": {
 			"version": "22.4.3",
 			"resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-22.4.3.tgz",
-			"integrity": "sha512-LFg1gWr3QinIjb8j833bq7jtQopiwdAs67OGfkPrvy7uNUbVMfTXXcOKXJaeY5GgjobELkKvKENqq1xrUectWg==",
-			"dev": true
+			"integrity": "sha512-LFg1gWr3QinIjb8j833bq7jtQopiwdAs67OGfkPrvy7uNUbVMfTXXcOKXJaeY5GgjobELkKvKENqq1xrUectWg=="
 		},
 		"jest-resolve": {
 			"version": "22.4.3",
 			"resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-22.4.3.tgz",
 			"integrity": "sha512-u3BkD/MQBmwrOJDzDIaxpyqTxYH+XqAXzVJP51gt29H8jpj3QgKof5GGO2uPGKGeA1yTMlpbMs1gIQ6U4vcRhw==",
-			"dev": true,
 			"requires": {
 				"browser-resolve": "^1.11.2",
 				"chalk": "^2.0.1"
@@ -8207,7 +7497,6 @@
 			"version": "22.4.3",
 			"resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-22.4.3.tgz",
 			"integrity": "sha512-06czCMVToSN8F2U4EvgSB1Bv/56gc7MpCftZ9z9fBgUQM7dzHGCMBsyfVA6dZTx8v0FDcnALf7hupeQxaBCvpA==",
-			"dev": true,
 			"requires": {
 				"jest-regex-util": "^22.4.3"
 			}
@@ -8216,7 +7505,6 @@
 			"version": "22.4.4",
 			"resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-22.4.4.tgz",
 			"integrity": "sha512-5S/OpB51igQW9xnkM5Tgd/7ZjiAuIoiJAVtvVTBcEBiXBIFzWM3BAMPBM19FX68gRV0KWyFuGKj0EY3M3aceeQ==",
-			"dev": true,
 			"requires": {
 				"exit": "^0.1.2",
 				"jest-config": "^22.4.4",
@@ -8235,7 +7523,6 @@
 			"version": "22.4.4",
 			"resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-22.4.4.tgz",
 			"integrity": "sha512-WRTj9m///npte1YjuphCYX7GRY/c2YvJImU9t7qOwFcqHr4YMzmX6evP/3Sehz5DKW2Vi8ONYPCFWe36JVXxfw==",
-			"dev": true,
 			"requires": {
 				"babel-core": "^6.0.0",
 				"babel-jest": "^22.4.4",
@@ -8262,14 +7549,12 @@
 				"ansi-regex": {
 					"version": "3.0.0",
 					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-					"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-					"dev": true
+					"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
 				},
 				"arr-diff": {
 					"version": "2.0.0",
 					"resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
 					"integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
-					"dev": true,
 					"requires": {
 						"arr-flatten": "^1.0.1"
 					}
@@ -8277,14 +7562,12 @@
 				"array-unique": {
 					"version": "0.2.1",
 					"resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
-					"integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
-					"dev": true
+					"integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM="
 				},
 				"braces": {
 					"version": "1.8.5",
 					"resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
 					"integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
-					"dev": true,
 					"requires": {
 						"expand-range": "^1.8.1",
 						"preserve": "^0.2.0",
@@ -8294,14 +7577,12 @@
 				"camelcase": {
 					"version": "4.1.0",
 					"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
-					"integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
-					"dev": true
+					"integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0="
 				},
 				"cliui": {
 					"version": "4.1.0",
 					"resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
 					"integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
-					"dev": true,
 					"requires": {
 						"string-width": "^2.1.1",
 						"strip-ansi": "^4.0.0",
@@ -8312,7 +7593,6 @@
 					"version": "0.1.5",
 					"resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
 					"integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
-					"dev": true,
 					"requires": {
 						"is-posix-bracket": "^0.1.0"
 					}
@@ -8321,7 +7601,6 @@
 					"version": "0.3.2",
 					"resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
 					"integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
-					"dev": true,
 					"requires": {
 						"is-extglob": "^1.0.0"
 					}
@@ -8329,14 +7608,12 @@
 				"is-extglob": {
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-					"integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-					"dev": true
+					"integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA="
 				},
 				"is-glob": {
 					"version": "2.0.1",
 					"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
 					"integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-					"dev": true,
 					"requires": {
 						"is-extglob": "^1.0.0"
 					}
@@ -8345,7 +7622,6 @@
 					"version": "2.3.11",
 					"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
 					"integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
-					"dev": true,
 					"requires": {
 						"arr-diff": "^2.0.0",
 						"array-unique": "^0.2.1",
@@ -8366,7 +7642,6 @@
 					"version": "4.0.0",
 					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
 					"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-					"dev": true,
 					"requires": {
 						"ansi-regex": "^3.0.0"
 					}
@@ -8375,7 +7650,6 @@
 					"version": "10.1.2",
 					"resolved": "https://registry.npmjs.org/yargs/-/yargs-10.1.2.tgz",
 					"integrity": "sha512-ivSoxqBGYOqQVruxD35+EyCFDYNEFL/Uo6FcOnz+9xZdZzK0Zzw4r4KhbrME1Oo2gOggwJod2MnsdamSG7H9ig==",
-					"dev": true,
 					"requires": {
 						"cliui": "^4.0.0",
 						"decamelize": "^1.1.1",
@@ -8395,7 +7669,6 @@
 					"version": "8.1.0",
 					"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-8.1.0.tgz",
 					"integrity": "sha512-yP+6QqN8BmrgW2ggLtTbdrOyBNSI7zBa4IykmiV5R1wl1JWNxQvWhMfMdmzIYtKU7oP3OOInY/tl2ov3BDjnJQ==",
-					"dev": true,
 					"requires": {
 						"camelcase": "^4.1.0"
 					}
@@ -8405,14 +7678,12 @@
 		"jest-serializer": {
 			"version": "22.4.3",
 			"resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-22.4.3.tgz",
-			"integrity": "sha512-uPaUAppx4VUfJ0QDerpNdF43F68eqKWCzzhUlKNDsUPhjOon7ZehR4C809GCqh765FoMRtTVUVnGvIoskkYHiw==",
-			"dev": true
+			"integrity": "sha512-uPaUAppx4VUfJ0QDerpNdF43F68eqKWCzzhUlKNDsUPhjOon7ZehR4C809GCqh765FoMRtTVUVnGvIoskkYHiw=="
 		},
 		"jest-snapshot": {
 			"version": "22.4.3",
 			"resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-22.4.3.tgz",
 			"integrity": "sha512-JXA0gVs5YL0HtLDCGa9YxcmmV2LZbwJ+0MfyXBBc5qpgkEYITQFJP7XNhcHFbUvRiniRpRbGVfJrOoYhhGE0RQ==",
-			"dev": true,
 			"requires": {
 				"chalk": "^2.0.1",
 				"jest-diff": "^22.4.3",
@@ -8426,7 +7697,6 @@
 			"version": "22.4.3",
 			"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-22.4.3.tgz",
 			"integrity": "sha512-rfDfG8wyC5pDPNdcnAlZgwKnzHvZDu8Td2NJI/jAGKEGxJPYiE4F0ss/gSAkG4778Y23Hvbz+0GMrDJTeo7RjQ==",
-			"dev": true,
 			"requires": {
 				"callsites": "^2.0.0",
 				"chalk": "^2.0.1",
@@ -8440,8 +7710,7 @@
 				"source-map": {
 					"version": "0.6.1",
 					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-					"dev": true
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
 				}
 			}
 		},
@@ -8449,7 +7718,6 @@
 			"version": "22.4.4",
 			"resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-22.4.4.tgz",
 			"integrity": "sha512-dmlf4CIZRGvkaVg3fa0uetepcua44DHtktHm6rcoNVtYlpwe6fEJRkMFsaUVcFHLzbuBJ2cPw9Gl9TKfnzMVwg==",
-			"dev": true,
 			"requires": {
 				"chalk": "^2.0.1",
 				"jest-config": "^22.4.4",
@@ -8462,7 +7730,6 @@
 			"version": "22.4.3",
 			"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-22.4.3.tgz",
 			"integrity": "sha512-B1ucW4fI8qVAuZmicFxI1R3kr2fNeYJyvIQ1rKcuLYnenFV5K5aMbxFj6J0i00Ju83S8jP2d7Dz14+AvbIHRYQ==",
-			"dev": true,
 			"requires": {
 				"merge-stream": "^1.0.1"
 			}
@@ -8475,8 +7742,7 @@
 		"js-base64": {
 			"version": "2.4.5",
 			"resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.4.5.tgz",
-			"integrity": "sha512-aUnNwqMOXw3yvErjMPSQu6qIIzUmT1e5KcU1OZxRDU1g/am6mzBvcrmLAYwzmB59BHPrh5/tKaiF4OPhqRWESQ==",
-			"dev": true
+			"integrity": "sha512-aUnNwqMOXw3yvErjMPSQu6qIIzUmT1e5KcU1OZxRDU1g/am6mzBvcrmLAYwzmB59BHPrh5/tKaiF4OPhqRWESQ=="
 		},
 		"js-beautify": {
 			"version": "1.6.14",
@@ -8498,7 +7764,6 @@
 			"version": "3.11.0",
 			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.11.0.tgz",
 			"integrity": "sha512-saJstZWv7oNeOyBh3+Dx1qWzhW0+e6/8eDzo7p5rDFqxntSztloLtuKu+Ejhtq82jsilwOIZYsCz+lIjthg1Hw==",
-			"dev": true,
 			"requires": {
 				"argparse": "^1.0.7",
 				"esprima": "^4.0.0"
@@ -8508,14 +7773,12 @@
 			"version": "0.1.1",
 			"resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
 			"integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-			"dev": true,
 			"optional": true
 		},
 		"jscodeshift": {
 			"version": "0.5.0",
 			"resolved": "https://registry.npmjs.org/jscodeshift/-/jscodeshift-0.5.0.tgz",
 			"integrity": "sha512-JAcQINNMFpdzzpKJN8k5xXjF3XDuckB1/48uScSzcnNyK199iWEc9AxKL9OoX5144M2w5zEx9Qs4/E/eBZZUlw==",
-			"dev": true,
 			"requires": {
 				"babel-plugin-transform-flow-strip-types": "^6.8.0",
 				"babel-preset-es2015": "^6.9.0",
@@ -8537,14 +7800,12 @@
 				"ansi-styles": {
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.0.0.tgz",
-					"integrity": "sha1-yxAt8cVvUSPquLZ817mAJ6AnkXg=",
-					"dev": true
+					"integrity": "sha1-yxAt8cVvUSPquLZ817mAJ6AnkXg="
 				},
 				"arr-diff": {
 					"version": "2.0.0",
 					"resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
 					"integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
-					"dev": true,
 					"requires": {
 						"arr-flatten": "^1.0.1"
 					}
@@ -8552,20 +7813,17 @@
 				"array-unique": {
 					"version": "0.2.1",
 					"resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
-					"integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
-					"dev": true
+					"integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM="
 				},
 				"babylon": {
 					"version": "7.0.0-beta.47",
 					"resolved": "https://registry.npmjs.org/babylon/-/babylon-7.0.0-beta.47.tgz",
-					"integrity": "sha512-+rq2cr4GDhtToEzKFD6KZZMDBXhjFAr9JjPw9pAppZACeEWqNM294j+NdBzkSHYXwzzBmVjZ3nEVJlOhbR2gOQ==",
-					"dev": true
+					"integrity": "sha512-+rq2cr4GDhtToEzKFD6KZZMDBXhjFAr9JjPw9pAppZACeEWqNM294j+NdBzkSHYXwzzBmVjZ3nEVJlOhbR2gOQ=="
 				},
 				"braces": {
 					"version": "1.8.5",
 					"resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
 					"integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
-					"dev": true,
 					"requires": {
 						"expand-range": "^1.8.1",
 						"preserve": "^0.2.0",
@@ -8576,7 +7834,6 @@
 					"version": "0.4.0",
 					"resolved": "https://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz",
 					"integrity": "sha1-UZmj3c0MHv4jvAjBsCewYXbgxk8=",
-					"dev": true,
 					"requires": {
 						"ansi-styles": "~1.0.0",
 						"has-color": "~0.1.0",
@@ -8586,14 +7843,12 @@
 				"colors": {
 					"version": "1.2.5",
 					"resolved": "https://registry.npmjs.org/colors/-/colors-1.2.5.tgz",
-					"integrity": "sha512-erNRLao/Y3Fv54qUa0LBB+//Uf3YwMUmdJinN20yMXm9zdKKqH9wt7R9IIVZ+K7ShzfpLV/Zg8+VyrBJYB4lpg==",
-					"dev": true
+					"integrity": "sha512-erNRLao/Y3Fv54qUa0LBB+//Uf3YwMUmdJinN20yMXm9zdKKqH9wt7R9IIVZ+K7ShzfpLV/Zg8+VyrBJYB4lpg=="
 				},
 				"expand-brackets": {
 					"version": "0.1.5",
 					"resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
 					"integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
-					"dev": true,
 					"requires": {
 						"is-posix-bracket": "^0.1.0"
 					}
@@ -8602,7 +7857,6 @@
 					"version": "0.3.2",
 					"resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
 					"integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
-					"dev": true,
 					"requires": {
 						"is-extglob": "^1.0.0"
 					}
@@ -8610,14 +7864,12 @@
 				"is-extglob": {
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-					"integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-					"dev": true
+					"integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA="
 				},
 				"is-glob": {
 					"version": "2.0.1",
 					"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
 					"integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-					"dev": true,
 					"requires": {
 						"is-extglob": "^1.0.0"
 					}
@@ -8626,7 +7878,6 @@
 					"version": "2.3.11",
 					"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
 					"integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
-					"dev": true,
 					"requires": {
 						"arr-diff": "^2.0.0",
 						"array-unique": "^0.2.1",
@@ -8647,7 +7898,6 @@
 					"version": "1.8.1",
 					"resolved": "https://registry.npmjs.org/nomnom/-/nomnom-1.8.1.tgz",
 					"integrity": "sha1-IVH3Ikcrp55Qp2/BJbuMjy5Nwqc=",
-					"dev": true,
 					"requires": {
 						"chalk": "~0.4.0",
 						"underscore": "~1.6.0"
@@ -8656,20 +7906,17 @@
 				"strip-ansi": {
 					"version": "0.1.1",
 					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz",
-					"integrity": "sha1-OeipjQRNFQZgq+SmgIrPcLt7yZE=",
-					"dev": true
+					"integrity": "sha1-OeipjQRNFQZgq+SmgIrPcLt7yZE="
 				},
 				"underscore": {
 					"version": "1.6.0",
 					"resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz",
-					"integrity": "sha1-izixDKze9jM3uLJOT/htRa6lKag=",
-					"dev": true
+					"integrity": "sha1-izixDKze9jM3uLJOT/htRa6lKag="
 				},
 				"write-file-atomic": {
 					"version": "1.3.4",
 					"resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.4.tgz",
 					"integrity": "sha1-+Aek8LHZ6ROuekgRLmzDrxmRtF8=",
-					"dev": true,
 					"requires": {
 						"graceful-fs": "^4.1.11",
 						"imurmurhash": "^0.1.4",
@@ -8682,7 +7929,6 @@
 			"version": "11.11.0",
 			"resolved": "https://registry.npmjs.org/jsdom/-/jsdom-11.11.0.tgz",
 			"integrity": "sha512-ou1VyfjwsSuWkudGxb03FotDajxAto6USAlmMZjE2lc0jCznt7sBWkhfRBRaWwbnmDqdMSTKTLT5d9sBFkkM7A==",
-			"dev": true,
 			"requires": {
 				"abab": "^1.0.4",
 				"acorn": "^5.3.0",
@@ -8715,22 +7961,19 @@
 				"parse5": {
 					"version": "4.0.0",
 					"resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz",
-					"integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==",
-					"dev": true
+					"integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA=="
 				}
 			}
 		},
 		"jsesc": {
 			"version": "0.5.0",
 			"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-			"integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
-			"dev": true
+			"integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0="
 		},
 		"json-buffer": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz",
-			"integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=",
-			"dev": true
+			"integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg="
 		},
 		"json-parse-better-errors": {
 			"version": "1.0.2",
@@ -8740,20 +7983,17 @@
 		"json-schema": {
 			"version": "0.2.3",
 			"resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-			"integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
-			"dev": true
+			"integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
 		},
 		"json-schema-traverse": {
 			"version": "0.3.1",
 			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
-			"integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=",
-			"dev": true
+			"integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A="
 		},
 		"json-stable-stringify": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
 			"integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
-			"dev": true,
 			"requires": {
 				"jsonify": "~0.0.0"
 			}
@@ -8761,8 +8001,7 @@
 		"json-stable-stringify-without-jsonify": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-			"integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
-			"dev": true
+			"integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE="
 		},
 		"json-stringify-safe": {
 			"version": "5.0.1",
@@ -8772,8 +8011,7 @@
 		"json5": {
 			"version": "0.5.1",
 			"resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
-			"integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
-			"dev": true
+			"integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE="
 		},
 		"jsonfile": {
 			"version": "4.0.0",
@@ -8786,8 +8024,7 @@
 		"jsonify": {
 			"version": "0.0.0",
 			"resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
-			"integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
-			"dev": true
+			"integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM="
 		},
 		"jsonparse": {
 			"version": "1.3.1",
@@ -8798,7 +8035,6 @@
 			"version": "1.4.1",
 			"resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
 			"integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-			"dev": true,
 			"requires": {
 				"assert-plus": "1.0.0",
 				"extsprintf": "1.3.0",
@@ -8809,14 +8045,12 @@
 		"jsx-ast-utils": {
 			"version": "1.4.1",
 			"resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-1.4.1.tgz",
-			"integrity": "sha1-OGchPo3Xm/Ho8jAMDPwe+xgsDfE=",
-			"dev": true
+			"integrity": "sha1-OGchPo3Xm/Ho8jAMDPwe+xgsDfE="
 		},
 		"keyv": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/keyv/-/keyv-3.0.0.tgz",
 			"integrity": "sha512-eguHnq22OE3uVoSYG0LVWNP+4ppamWr9+zWBe1bsNcovIMy6huUJFPgy4mGwCd/rnl3vOLGW1MTlu4c57CT1xA==",
-			"dev": true,
 			"requires": {
 				"json-buffer": "3.0.0"
 			}
@@ -8846,14 +8080,12 @@
 		"leb": {
 			"version": "0.3.0",
 			"resolved": "https://registry.npmjs.org/leb/-/leb-0.3.0.tgz",
-			"integrity": "sha1-Mr7p+tFoMo1q6oUi2DP0GA7tHaM=",
-			"dev": true
+			"integrity": "sha1-Mr7p+tFoMo1q6oUi2DP0GA7tHaM="
 		},
 		"left-pad": {
 			"version": "1.3.0",
 			"resolved": "https://registry.npmjs.org/left-pad/-/left-pad-1.3.0.tgz",
-			"integrity": "sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA==",
-			"dev": true
+			"integrity": "sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA=="
 		},
 		"lerna": {
 			"version": "2.11.0",
@@ -8904,14 +8136,12 @@
 		"leven": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz",
-			"integrity": "sha1-wuep93IJTe6dNCAq6KzORoeHVYA=",
-			"dev": true
+			"integrity": "sha1-wuep93IJTe6dNCAq6KzORoeHVYA="
 		},
 		"levn": {
 			"version": "0.3.0",
 			"resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
 			"integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
-			"dev": true,
 			"requires": {
 				"prelude-ls": "~1.1.2",
 				"type-check": "~0.3.2"
@@ -8929,7 +8159,6 @@
 			"version": "0.13.0",
 			"resolved": "https://registry.npmjs.org/listr/-/listr-0.13.0.tgz",
 			"integrity": "sha1-ILsLowuuZg7oTMBQPfS+PVYjiH0=",
-			"dev": true,
 			"requires": {
 				"chalk": "^1.1.3",
 				"cli-truncate": "^0.2.1",
@@ -8953,14 +8182,12 @@
 				"ansi-styles": {
 					"version": "2.2.1",
 					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-					"dev": true
+					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
 				},
 				"chalk": {
 					"version": "1.1.3",
 					"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
 					"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-					"dev": true,
 					"requires": {
 						"ansi-styles": "^2.2.1",
 						"escape-string-regexp": "^1.0.2",
@@ -8973,7 +8200,6 @@
 					"version": "1.7.0",
 					"resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
 					"integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
-					"dev": true,
 					"requires": {
 						"escape-string-regexp": "^1.0.5",
 						"object-assign": "^4.1.0"
@@ -8983,7 +8209,6 @@
 					"version": "2.1.0",
 					"resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
 					"integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
-					"dev": true,
 					"requires": {
 						"repeating": "^2.0.0"
 					}
@@ -8992,7 +8217,6 @@
 					"version": "1.0.2",
 					"resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz",
 					"integrity": "sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg=",
-					"dev": true,
 					"requires": {
 						"chalk": "^1.0.0"
 					}
@@ -9000,22 +8224,19 @@
 				"supports-color": {
 					"version": "2.0.0",
 					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-					"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-					"dev": true
+					"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
 				}
 			}
 		},
 		"listr-silent-renderer": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/listr-silent-renderer/-/listr-silent-renderer-1.1.1.tgz",
-			"integrity": "sha1-kktaN1cVN3C/Go4/v3S4u/P5JC4=",
-			"dev": true
+			"integrity": "sha1-kktaN1cVN3C/Go4/v3S4u/P5JC4="
 		},
 		"listr-update-renderer": {
 			"version": "0.4.0",
 			"resolved": "https://registry.npmjs.org/listr-update-renderer/-/listr-update-renderer-0.4.0.tgz",
 			"integrity": "sha1-NE2YDaLKLosUW6MFkI8yrj9MyKc=",
-			"dev": true,
 			"requires": {
 				"chalk": "^1.1.3",
 				"cli-truncate": "^0.2.1",
@@ -9030,14 +8251,12 @@
 				"ansi-styles": {
 					"version": "2.2.1",
 					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-					"dev": true
+					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
 				},
 				"chalk": {
 					"version": "1.1.3",
 					"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
 					"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-					"dev": true,
 					"requires": {
 						"ansi-styles": "^2.2.1",
 						"escape-string-regexp": "^1.0.2",
@@ -9050,7 +8269,6 @@
 					"version": "1.7.0",
 					"resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
 					"integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
-					"dev": true,
 					"requires": {
 						"escape-string-regexp": "^1.0.5",
 						"object-assign": "^4.1.0"
@@ -9060,7 +8278,6 @@
 					"version": "1.0.2",
 					"resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz",
 					"integrity": "sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg=",
-					"dev": true,
 					"requires": {
 						"chalk": "^1.0.0"
 					}
@@ -9068,8 +8285,7 @@
 				"supports-color": {
 					"version": "2.0.0",
 					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-					"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-					"dev": true
+					"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
 				}
 			}
 		},
@@ -9077,7 +8293,6 @@
 			"version": "0.4.1",
 			"resolved": "https://registry.npmjs.org/listr-verbose-renderer/-/listr-verbose-renderer-0.4.1.tgz",
 			"integrity": "sha1-ggb0z21S3cWCfl/RSYng6WWTOjU=",
-			"dev": true,
 			"requires": {
 				"chalk": "^1.1.3",
 				"cli-cursor": "^1.0.2",
@@ -9088,14 +8303,12 @@
 				"ansi-styles": {
 					"version": "2.2.1",
 					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-					"dev": true
+					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
 				},
 				"chalk": {
 					"version": "1.1.3",
 					"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
 					"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-					"dev": true,
 					"requires": {
 						"ansi-styles": "^2.2.1",
 						"escape-string-regexp": "^1.0.2",
@@ -9108,7 +8321,6 @@
 					"version": "1.0.2",
 					"resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz",
 					"integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=",
-					"dev": true,
 					"requires": {
 						"restore-cursor": "^1.0.1"
 					}
@@ -9117,7 +8329,6 @@
 					"version": "1.7.0",
 					"resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
 					"integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
-					"dev": true,
 					"requires": {
 						"escape-string-regexp": "^1.0.5",
 						"object-assign": "^4.1.0"
@@ -9126,14 +8337,12 @@
 				"onetime": {
 					"version": "1.1.0",
 					"resolved": "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
-					"integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=",
-					"dev": true
+					"integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k="
 				},
 				"restore-cursor": {
 					"version": "1.0.1",
 					"resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz",
 					"integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=",
-					"dev": true,
 					"requires": {
 						"exit-hook": "^1.0.0",
 						"onetime": "^1.0.0"
@@ -9142,16 +8351,14 @@
 				"supports-color": {
 					"version": "2.0.0",
 					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-					"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-					"dev": true
+					"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
 				}
 			}
 		},
 		"livereload-js": {
 			"version": "2.3.0",
 			"resolved": "https://registry.npmjs.org/livereload-js/-/livereload-js-2.3.0.tgz",
-			"integrity": "sha512-j1R0/FeGa64Y+NmqfZhyoVRzcFlOZ8sNlKzHjh4VvLULFACZhn68XrX5DFg2FhMvSMJmROuFxRSa560ECWKBMg==",
-			"dev": true
+			"integrity": "sha512-j1R0/FeGa64Y+NmqfZhyoVRzcFlOZ8sNlKzHjh4VvLULFACZhn68XrX5DFg2FhMvSMJmROuFxRSa560ECWKBMg=="
 		},
 		"load-json-file": {
 			"version": "4.0.0",
@@ -9167,14 +8374,12 @@
 		"loader-runner": {
 			"version": "2.3.0",
 			"resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.3.0.tgz",
-			"integrity": "sha1-9IKuqC1UPgeSFwDVpG7yb9rGuKI=",
-			"dev": true
+			"integrity": "sha1-9IKuqC1UPgeSFwDVpG7yb9rGuKI="
 		},
 		"loader-utils": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz",
 			"integrity": "sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=",
-			"dev": true,
 			"requires": {
 				"big.js": "^3.1.3",
 				"emojis-list": "^2.0.0",
@@ -9204,7 +8409,6 @@
 			"version": "3.0.7",
 			"resolved": "https://registry.npmjs.org/lodash._baseisequal/-/lodash._baseisequal-3.0.7.tgz",
 			"integrity": "sha1-2AJfdjOdKTQnZ9zIh85cuVpbUfE=",
-			"dev": true,
 			"requires": {
 				"lodash.isarray": "^3.0.0",
 				"lodash.istypedarray": "^3.0.0",
@@ -9214,14 +8418,12 @@
 		"lodash._bindcallback": {
 			"version": "3.0.1",
 			"resolved": "https://registry.npmjs.org/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz",
-			"integrity": "sha1-5THCdkTPi1epnhftlbNcdIeJOS4=",
-			"dev": true
+			"integrity": "sha1-5THCdkTPi1epnhftlbNcdIeJOS4="
 		},
 		"lodash._getnative": {
 			"version": "3.9.1",
 			"resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
-			"integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=",
-			"dev": true
+			"integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U="
 		},
 		"lodash._reinterpolate": {
 			"version": "3.0.0",
@@ -9231,38 +8433,32 @@
 		"lodash.assign": {
 			"version": "4.2.0",
 			"resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz",
-			"integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=",
-			"dev": true
+			"integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc="
 		},
 		"lodash.clonedeep": {
 			"version": "4.5.0",
 			"resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
-			"integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
-			"dev": true
+			"integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8="
 		},
 		"lodash.flattendeep": {
 			"version": "4.4.0",
 			"resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz",
-			"integrity": "sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=",
-			"dev": true
+			"integrity": "sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI="
 		},
 		"lodash.isarguments": {
 			"version": "3.1.0",
 			"resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
-			"integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=",
-			"dev": true
+			"integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo="
 		},
 		"lodash.isarray": {
 			"version": "3.0.4",
 			"resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
-			"integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=",
-			"dev": true
+			"integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U="
 		},
 		"lodash.isequal": {
 			"version": "3.0.4",
 			"resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-3.0.4.tgz",
 			"integrity": "sha1-HDXrO27wzR/1F0Pj6jz3/f/ay2Q=",
-			"dev": true,
 			"requires": {
 				"lodash._baseisequal": "^3.0.0",
 				"lodash._bindcallback": "^3.0.0"
@@ -9271,14 +8467,12 @@
 		"lodash.istypedarray": {
 			"version": "3.0.6",
 			"resolved": "https://registry.npmjs.org/lodash.istypedarray/-/lodash.istypedarray-3.0.6.tgz",
-			"integrity": "sha1-yaR3SYYHUB2OhJTSg7h8OSgc72I=",
-			"dev": true
+			"integrity": "sha1-yaR3SYYHUB2OhJTSg7h8OSgc72I="
 		},
 		"lodash.keys": {
 			"version": "3.1.2",
 			"resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
 			"integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
-			"dev": true,
 			"requires": {
 				"lodash._getnative": "^3.0.0",
 				"lodash.isarguments": "^3.0.0",
@@ -9288,32 +8482,27 @@
 		"lodash.memoize": {
 			"version": "4.1.2",
 			"resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
-			"integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=",
-			"dev": true
+			"integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4="
 		},
 		"lodash.merge": {
 			"version": "4.6.1",
 			"resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.1.tgz",
-			"integrity": "sha512-AOYza4+Hf5z1/0Hztxpm2/xiPZgi/cjMqdnKTUWTBSKchJlxXXuUSxCCl8rJlf4g6yww/j6mA8nC8Hw/EZWxKQ==",
-			"dev": true
+			"integrity": "sha512-AOYza4+Hf5z1/0Hztxpm2/xiPZgi/cjMqdnKTUWTBSKchJlxXXuUSxCCl8rJlf4g6yww/j6mA8nC8Hw/EZWxKQ=="
 		},
 		"lodash.mergewith": {
 			"version": "4.6.1",
 			"resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz",
-			"integrity": "sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ==",
-			"dev": true
+			"integrity": "sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ=="
 		},
 		"lodash.sortby": {
 			"version": "4.7.0",
 			"resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
-			"integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=",
-			"dev": true
+			"integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg="
 		},
 		"lodash.tail": {
 			"version": "4.1.1",
 			"resolved": "https://registry.npmjs.org/lodash.tail/-/lodash.tail-4.1.1.tgz",
-			"integrity": "sha1-0jM6NtnncXyK0vfKyv7HwytERmQ=",
-			"dev": true
+			"integrity": "sha1-0jM6NtnncXyK0vfKyv7HwytERmQ="
 		},
 		"lodash.template": {
 			"version": "4.4.0",
@@ -9335,14 +8524,12 @@
 		"lodash.uniq": {
 			"version": "4.5.0",
 			"resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
-			"integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=",
-			"dev": true
+			"integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M="
 		},
 		"log-symbols": {
 			"version": "2.2.0",
 			"resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz",
 			"integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
-			"dev": true,
 			"requires": {
 				"chalk": "^2.0.1"
 			}
@@ -9351,7 +8538,6 @@
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/log-update/-/log-update-1.0.2.tgz",
 			"integrity": "sha1-GZKfZMQJPS0ucHWh2tivWcKWuNE=",
-			"dev": true,
 			"requires": {
 				"ansi-escapes": "^1.0.0",
 				"cli-cursor": "^1.0.2"
@@ -9360,14 +8546,12 @@
 				"ansi-escapes": {
 					"version": "1.4.0",
 					"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz",
-					"integrity": "sha1-06ioOzGapneTZisT52HHkRQiMG4=",
-					"dev": true
+					"integrity": "sha1-06ioOzGapneTZisT52HHkRQiMG4="
 				},
 				"cli-cursor": {
 					"version": "1.0.2",
 					"resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz",
 					"integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=",
-					"dev": true,
 					"requires": {
 						"restore-cursor": "^1.0.1"
 					}
@@ -9375,14 +8559,12 @@
 				"onetime": {
 					"version": "1.1.0",
 					"resolved": "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
-					"integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=",
-					"dev": true
+					"integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k="
 				},
 				"restore-cursor": {
 					"version": "1.0.1",
 					"resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz",
 					"integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=",
-					"dev": true,
 					"requires": {
 						"exit-hook": "^1.0.0",
 						"onetime": "^1.0.0"
@@ -9393,8 +8575,7 @@
 		"long": {
 			"version": "3.2.0",
 			"resolved": "https://registry.npmjs.org/long/-/long-3.2.0.tgz",
-			"integrity": "sha1-2CG3E4yhy1gcFymQ7xTbIAtcR0s=",
-			"dev": true
+			"integrity": "sha1-2CG3E4yhy1gcFymQ7xTbIAtcR0s="
 		},
 		"longest": {
 			"version": "1.0.1",
@@ -9443,7 +8624,6 @@
 			"version": "1.0.11",
 			"resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz",
 			"integrity": "sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=",
-			"dev": true,
 			"requires": {
 				"tmpl": "1.0.x"
 			}
@@ -9451,8 +8631,7 @@
 		"map-cache": {
 			"version": "0.2.2",
 			"resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
-			"integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
-			"dev": true
+			"integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8="
 		},
 		"map-obj": {
 			"version": "2.0.0",
@@ -9462,14 +8641,12 @@
 		"map-values": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/map-values/-/map-values-1.0.1.tgz",
-			"integrity": "sha1-douOecAJvytk/ugG4ip7HEGQyZA=",
-			"dev": true
+			"integrity": "sha1-douOecAJvytk/ugG4ip7HEGQyZA="
 		},
 		"map-visit": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
 			"integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
-			"dev": true,
 			"requires": {
 				"object-visit": "^1.0.0"
 			}
@@ -9482,20 +8659,17 @@
 		"math-expression-evaluator": {
 			"version": "1.2.17",
 			"resolved": "https://registry.npmjs.org/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz",
-			"integrity": "sha1-3oGf282E3M2PrlnGrreWFbnSZqw=",
-			"dev": true
+			"integrity": "sha1-3oGf282E3M2PrlnGrreWFbnSZqw="
 		},
 		"math-random": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.1.tgz",
-			"integrity": "sha1-izqsWIuKZuSXXjzepn97sylgH6w=",
-			"dev": true
+			"integrity": "sha1-izqsWIuKZuSXXjzepn97sylgH6w="
 		},
 		"md5.js": {
 			"version": "1.3.4",
 			"resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz",
 			"integrity": "sha1-6b296UogpawYsENA/Fdk1bCdkB0=",
-			"dev": true,
 			"requires": {
 				"hash-base": "^3.0.0",
 				"inherits": "^2.0.1"
@@ -9513,7 +8687,6 @@
 			"version": "1.1.3",
 			"resolved": "https://registry.npmjs.org/mem-fs/-/mem-fs-1.1.3.tgz",
 			"integrity": "sha1-uK6NLj/Lb10/kWXBLUVRoGXZicw=",
-			"dev": true,
 			"requires": {
 				"through2": "^2.0.0",
 				"vinyl": "^1.1.0",
@@ -9524,7 +8697,6 @@
 			"version": "4.0.2",
 			"resolved": "https://registry.npmjs.org/mem-fs-editor/-/mem-fs-editor-4.0.2.tgz",
 			"integrity": "sha512-QHvdXLLNmwJXxKdf7x27aNUren6IoPxwcM8Sfd+S6/ddQQMcYdEtVKsh6ilpqMrU18VQuKZEaH0aCGt3JDbA0g==",
-			"dev": true,
 			"requires": {
 				"commondir": "^1.0.1",
 				"deep-extend": "^0.5.1",
@@ -9542,20 +8714,17 @@
 				"clone": {
 					"version": "2.1.1",
 					"resolved": "https://registry.npmjs.org/clone/-/clone-2.1.1.tgz",
-					"integrity": "sha1-0hfR6WERjjrJpLi7oyhVU79kfNs=",
-					"dev": true
+					"integrity": "sha1-0hfR6WERjjrJpLi7oyhVU79kfNs="
 				},
 				"clone-stats": {
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz",
-					"integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=",
-					"dev": true
+					"integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA="
 				},
 				"globby": {
 					"version": "8.0.1",
 					"resolved": "https://registry.npmjs.org/globby/-/globby-8.0.1.tgz",
 					"integrity": "sha512-oMrYrJERnKBLXNLVTqhm3vPEdJ/b2ZE28xN4YARiix1NOIOBPEpOUnm844K1iu/BkphCaf2WNFwMszv8Soi1pw==",
-					"dev": true,
 					"requires": {
 						"array-union": "^1.0.1",
 						"dir-glob": "^2.0.0",
@@ -9569,14 +8738,12 @@
 				"replace-ext": {
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz",
-					"integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=",
-					"dev": true
+					"integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs="
 				},
 				"vinyl": {
 					"version": "2.1.0",
 					"resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.1.0.tgz",
 					"integrity": "sha1-Ah+cLPlR1rk5lDyJ617lrdT9kkw=",
-					"dev": true,
 					"requires": {
 						"clone": "^2.1.1",
 						"clone-buffer": "^1.0.0",
@@ -9597,7 +8764,6 @@
 			"version": "0.4.1",
 			"resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
 			"integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
-			"dev": true,
 			"requires": {
 				"errno": "^0.1.3",
 				"readable-stream": "^2.0.1"
@@ -9644,7 +8810,6 @@
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz",
 			"integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=",
-			"dev": true,
 			"requires": {
 				"readable-stream": "^2.0.1"
 			}
@@ -9652,14 +8817,12 @@
 		"merge2": {
 			"version": "1.2.2",
 			"resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.2.tgz",
-			"integrity": "sha512-bgM8twH86rWni21thii6WCMQMRMmwqqdW3sGWi9IipnVAszdLXRjwDwAnyrVXo6DuP3AjRMMttZKUB48QWIFGg==",
-			"dev": true
+			"integrity": "sha512-bgM8twH86rWni21thii6WCMQMRMmwqqdW3sGWi9IipnVAszdLXRjwDwAnyrVXo6DuP3AjRMMttZKUB48QWIFGg=="
 		},
 		"micromatch": {
 			"version": "3.1.10",
 			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
 			"integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-			"dev": true,
 			"requires": {
 				"arr-diff": "^4.0.0",
 				"array-unique": "^0.3.2",
@@ -9679,8 +8842,7 @@
 				"kind-of": {
 					"version": "6.0.2",
 					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-					"dev": true
+					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
 				}
 			}
 		},
@@ -9688,7 +8850,6 @@
 			"version": "4.0.1",
 			"resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
 			"integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
-			"dev": true,
 			"requires": {
 				"bn.js": "^4.0.0",
 				"brorand": "^1.0.1"
@@ -9697,20 +8858,17 @@
 		"mime": {
 			"version": "1.6.0",
 			"resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-			"integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
-			"dev": true
+			"integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
 		},
 		"mime-db": {
 			"version": "1.33.0",
 			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz",
-			"integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==",
-			"dev": true
+			"integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ=="
 		},
 		"mime-types": {
 			"version": "2.1.18",
 			"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz",
 			"integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==",
-			"dev": true,
 			"requires": {
 				"mime-db": "~1.33.0"
 			}
@@ -9723,20 +8881,17 @@
 		"mimic-response": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.0.tgz",
-			"integrity": "sha1-3z02Uqc/3ta5sLJBRub9BSNTRY4=",
-			"dev": true
+			"integrity": "sha1-3z02Uqc/3ta5sLJBRub9BSNTRY4="
 		},
 		"minimalistic-assert": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
-			"integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
-			"dev": true
+			"integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="
 		},
 		"minimalistic-crypto-utils": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
-			"integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=",
-			"dev": true
+			"integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo="
 		},
 		"minimatch": {
 			"version": "3.0.4",
@@ -9764,7 +8919,6 @@
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/mississippi/-/mississippi-2.0.0.tgz",
 			"integrity": "sha512-zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==",
-			"dev": true,
 			"requires": {
 				"concat-stream": "^1.5.0",
 				"duplexify": "^3.4.2",
@@ -9782,7 +8936,6 @@
 			"version": "1.3.1",
 			"resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz",
 			"integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==",
-			"dev": true,
 			"requires": {
 				"for-in": "^1.0.2",
 				"is-extendable": "^1.0.1"
@@ -9792,7 +8945,6 @@
 					"version": "1.0.1",
 					"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
 					"integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-					"dev": true,
 					"requires": {
 						"is-plain-object": "^2.0.4"
 					}
@@ -9803,7 +8955,6 @@
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/mixin-object/-/mixin-object-2.0.1.tgz",
 			"integrity": "sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=",
-			"dev": true,
 			"requires": {
 				"for-in": "^0.1.3",
 				"is-extendable": "^0.1.1"
@@ -9812,8 +8963,7 @@
 				"for-in": {
 					"version": "0.1.8",
 					"resolved": "https://registry.npmjs.org/for-in/-/for-in-0.1.8.tgz",
-					"integrity": "sha1-2Hc5COMSVhCZUrH9ubP6hn0ndeE=",
-					"dev": true
+					"integrity": "sha1-2Hc5COMSVhCZUrH9ubP6hn0ndeE="
 				}
 			}
 		},
@@ -9852,7 +9002,6 @@
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
 			"integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
-			"dev": true,
 			"requires": {
 				"aproba": "^1.1.1",
 				"copy-concurrently": "^1.0.0",
@@ -9865,14 +9014,12 @@
 		"ms": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-			"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-			"dev": true
+			"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
 		},
 		"multimatch": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/multimatch/-/multimatch-2.1.0.tgz",
 			"integrity": "sha1-nHkGoi+0wCkZ4vX3UWG0zb1LKis=",
-			"dev": true,
 			"requires": {
 				"array-differ": "^1.0.0",
 				"array-union": "^1.0.1",
@@ -9888,14 +9035,12 @@
 		"nan": {
 			"version": "2.10.0",
 			"resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz",
-			"integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==",
-			"dev": true
+			"integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA=="
 		},
 		"nanomatch": {
 			"version": "1.2.9",
 			"resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.9.tgz",
 			"integrity": "sha512-n8R9bS8yQ6eSXaV6jHUpKzD8gLsin02w1HSFiegwrs9E098Ylhw5jdyKPaYqvHknHaSCKTPp7C8dGCQ0q9koXA==",
-			"dev": true,
 			"requires": {
 				"arr-diff": "^4.0.0",
 				"array-unique": "^0.3.2",
@@ -9914,22 +9059,19 @@
 				"kind-of": {
 					"version": "6.0.2",
 					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-					"dev": true
+					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
 				}
 			}
 		},
 		"natural-compare": {
 			"version": "1.4.0",
 			"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-			"integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
-			"dev": true
+			"integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc="
 		},
 		"nearley": {
 			"version": "2.13.0",
 			"resolved": "https://registry.npmjs.org/nearley/-/nearley-2.13.0.tgz",
 			"integrity": "sha512-ioYYogSaZhFlCpRizQgY3UT3G1qFXmHGY/5ozoFE3dMfiCRAeJfh+IPE3/eh9gCZvqLhPCWb4bLt7Bqzo+1mLQ==",
-			"dev": true,
 			"requires": {
 				"nomnom": "~1.6.2",
 				"railroad-diagrams": "^1.0.0",
@@ -9940,20 +9082,17 @@
 		"neo-async": {
 			"version": "2.5.1",
 			"resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.5.1.tgz",
-			"integrity": "sha512-3KL3fvuRkZ7s4IFOMfztb7zJp3QaVWnBeGoJlgB38XnCRPj/0tLzzLG5IB8NYOHbJ8g8UGrgZv44GLDk6CxTxA==",
-			"dev": true
+			"integrity": "sha512-3KL3fvuRkZ7s4IFOMfztb7zJp3QaVWnBeGoJlgB38XnCRPj/0tLzzLG5IB8NYOHbJ8g8UGrgZv44GLDk6CxTxA=="
 		},
 		"nice-try": {
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.4.tgz",
-			"integrity": "sha512-2NpiFHqC87y/zFke0fC0spBXL3bBsoh/p5H1EFhshxjCR5+0g2d6BiXbUFz9v1sAcxsk2htp2eQnNIci2dIYcA==",
-			"dev": true
+			"integrity": "sha512-2NpiFHqC87y/zFke0fC0spBXL3bBsoh/p5H1EFhshxjCR5+0g2d6BiXbUFz9v1sAcxsk2htp2eQnNIci2dIYcA=="
 		},
 		"node-dir": {
 			"version": "0.1.8",
 			"resolved": "https://registry.npmjs.org/node-dir/-/node-dir-0.1.8.tgz",
-			"integrity": "sha1-VfuN62mQcHB/tn+RpGDwRIKUx30=",
-			"dev": true
+			"integrity": "sha1-VfuN62mQcHB/tn+RpGDwRIKUx30="
 		},
 		"node-fetch": {
 			"version": "1.7.3",
@@ -9968,7 +9107,6 @@
 			"version": "3.6.2",
 			"resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.2.tgz",
 			"integrity": "sha1-m/vlRWIoYoSDjnUOrAUpWFP6HGA=",
-			"dev": true,
 			"requires": {
 				"fstream": "^1.0.0",
 				"glob": "^7.0.3",
@@ -9988,22 +9126,19 @@
 				"semver": {
 					"version": "5.3.0",
 					"resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
-					"integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
-					"dev": true
+					"integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8="
 				}
 			}
 		},
 		"node-int64": {
 			"version": "0.4.0",
 			"resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
-			"integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=",
-			"dev": true
+			"integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs="
 		},
 		"node-libs-browser": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.1.0.tgz",
 			"integrity": "sha512-5AzFzdoIMb89hBGMZglEegffzgRg+ZFoUmisQ8HI4j1KDdpx13J0taNp2y9xPbur6W61gepGDDotGBVQ7mfUCg==",
-			"dev": true,
 			"requires": {
 				"assert": "^1.1.1",
 				"browserify-zlib": "^0.2.0",
@@ -10033,8 +9168,7 @@
 				"punycode": {
 					"version": "1.4.1",
 					"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-					"integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-					"dev": true
+					"integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
 				}
 			}
 		},
@@ -10042,7 +9176,6 @@
 			"version": "5.2.1",
 			"resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-5.2.1.tgz",
 			"integrity": "sha512-MIBs+AAd6dJ2SklbbE8RUDRlIVhU8MaNLh1A9SUZDUHPiZkWLFde6UNwG41yQHZEToHgJMXqyVZ9UcS/ReOVTg==",
-			"dev": true,
 			"requires": {
 				"growly": "^1.3.0",
 				"semver": "^5.4.1",
@@ -10053,7 +9186,6 @@
 		"node-sass": {
 			"version": "git://github.com/sass/node-sass.git#a51eca7f8bafdc9bafab76d2305fedc64503304c",
 			"from": "git://github.com/sass/node-sass.git#v4.7.0",
-			"dev": true,
 			"requires": {
 				"async-foreach": "^0.1.3",
 				"chalk": "^1.1.1",
@@ -10079,20 +9211,17 @@
 				"ansi-styles": {
 					"version": "2.2.1",
 					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-					"dev": true
+					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
 				},
 				"camelcase": {
 					"version": "2.1.1",
 					"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
-					"integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
-					"dev": true
+					"integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8="
 				},
 				"camelcase-keys": {
 					"version": "2.1.0",
 					"resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
 					"integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
-					"dev": true,
 					"requires": {
 						"camelcase": "^2.0.0",
 						"map-obj": "^1.0.0"
@@ -10102,7 +9231,6 @@
 					"version": "1.1.3",
 					"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
 					"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-					"dev": true,
 					"requires": {
 						"ansi-styles": "^2.2.1",
 						"escape-string-regexp": "^1.0.2",
@@ -10115,7 +9243,6 @@
 					"version": "3.0.1",
 					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz",
 					"integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=",
-					"dev": true,
 					"requires": {
 						"lru-cache": "^4.0.1",
 						"which": "^1.2.9"
@@ -10125,7 +9252,6 @@
 					"version": "2.1.0",
 					"resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
 					"integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
-					"dev": true,
 					"requires": {
 						"repeating": "^2.0.0"
 					}
@@ -10134,7 +9260,6 @@
 					"version": "4.1.3",
 					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz",
 					"integrity": "sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==",
-					"dev": true,
 					"requires": {
 						"pseudomap": "^1.0.2",
 						"yallist": "^2.1.2"
@@ -10143,14 +9268,12 @@
 				"map-obj": {
 					"version": "1.0.1",
 					"resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-					"integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
-					"dev": true
+					"integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0="
 				},
 				"meow": {
 					"version": "3.7.0",
 					"resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
 					"integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
-					"dev": true,
 					"requires": {
 						"camelcase-keys": "^2.0.0",
 						"decamelize": "^1.1.2",
@@ -10167,14 +9290,12 @@
 				"minimist": {
 					"version": "1.2.0",
 					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-					"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-					"dev": true
+					"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
 				},
 				"redent": {
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
 					"integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
-					"dev": true,
 					"requires": {
 						"indent-string": "^2.1.0",
 						"strip-indent": "^1.0.1"
@@ -10184,7 +9305,6 @@
 					"version": "1.0.1",
 					"resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
 					"integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
-					"dev": true,
 					"requires": {
 						"get-stdin": "^4.0.1"
 					}
@@ -10192,14 +9312,12 @@
 				"supports-color": {
 					"version": "2.0.0",
 					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-					"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-					"dev": true
+					"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
 				},
 				"trim-newlines": {
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
-					"integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
-					"dev": true
+					"integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM="
 				}
 			}
 		},
@@ -10207,7 +9325,6 @@
 			"version": "1.6.2",
 			"resolved": "https://registry.npmjs.org/nomnom/-/nomnom-1.6.2.tgz",
 			"integrity": "sha1-hKZqJgF0QI/Ft3oY+IjszET7aXE=",
-			"dev": true,
 			"requires": {
 				"colors": "0.5.x",
 				"underscore": "~1.4.4"
@@ -10236,7 +9353,6 @@
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
 			"integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-			"dev": true,
 			"requires": {
 				"remove-trailing-separator": "^1.0.1"
 			}
@@ -10244,14 +9360,12 @@
 		"normalize-range": {
 			"version": "0.1.2",
 			"resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
-			"integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
-			"dev": true
+			"integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI="
 		},
 		"normalize-url": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-2.0.1.tgz",
 			"integrity": "sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==",
-			"dev": true,
 			"requires": {
 				"prepend-http": "^2.0.0",
 				"query-string": "^5.0.1",
@@ -10261,8 +9375,7 @@
 				"prepend-http": {
 					"version": "2.0.0",
 					"resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz",
-					"integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=",
-					"dev": true
+					"integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc="
 				}
 			}
 		},
@@ -10270,7 +9383,6 @@
 			"version": "3.0.1",
 			"resolved": "https://registry.npmjs.org/npm-package-json-lint/-/npm-package-json-lint-3.0.1.tgz",
 			"integrity": "sha1-cMUePLOzaGeFlhJAHy9fTK1b2QQ=",
-			"dev": true,
 			"requires": {
 				"ajv": "^6.4.0",
 				"chalk": "^2.4.1",
@@ -10290,7 +9402,6 @@
 					"version": "6.5.0",
 					"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.0.tgz",
 					"integrity": "sha512-VDUX1oSajablmiyFyED9L1DFndg0P9h7p1F+NO8FkIzei6EPrR6Zu1n18rd5P8PqaSRd/FrWv3G1TVBqpM83gA==",
-					"dev": true,
 					"requires": {
 						"fast-deep-equal": "^2.0.1",
 						"fast-json-stable-stringify": "^2.0.0",
@@ -10301,20 +9412,17 @@
 				"camelcase": {
 					"version": "4.1.0",
 					"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
-					"integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
-					"dev": true
+					"integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0="
 				},
 				"fast-deep-equal": {
 					"version": "2.0.1",
 					"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-					"integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
-					"dev": true
+					"integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
 				},
 				"is-path-inside": {
 					"version": "2.0.0",
 					"resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.0.0.tgz",
 					"integrity": "sha512-OmUXvSq+P7aI/aRbl1dzwdlyLn8vW7Nr2/11S7y/dcLLgnQ89hgYJp7tfc+A5SRid3rNCLpruOp2CAV68/iOcA==",
-					"dev": true,
 					"requires": {
 						"path-is-inside": "^1.0.2"
 					}
@@ -10323,7 +9431,6 @@
 					"version": "5.0.0",
 					"resolved": "https://registry.npmjs.org/meow/-/meow-5.0.0.tgz",
 					"integrity": "sha512-CbTqYU17ABaLefO8vCU153ZZlprKYWDljcndKKDCFcYQITzWCXZAVk4QMFZPgvzrnUQ3uItnIE/LoUOwrT15Ig==",
-					"dev": true,
 					"requires": {
 						"camelcase-keys": "^4.0.0",
 						"decamelize-keys": "^1.0.0",
@@ -10340,7 +9447,6 @@
 					"version": "3.0.0",
 					"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz",
 					"integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=",
-					"dev": true,
 					"requires": {
 						"find-up": "^2.0.0",
 						"read-pkg": "^3.0.0"
@@ -10350,7 +9456,6 @@
 					"version": "10.0.0",
 					"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.0.0.tgz",
 					"integrity": "sha512-+DHejWujTVYeMHLff8U96rLc4uE4Emncoftvn5AjhB1Jw1pWxLzgBUT/WYbPrHmy6YPEBTZQx5myHhVcuuu64g==",
-					"dev": true,
 					"requires": {
 						"camelcase": "^4.1.0"
 					}
@@ -10380,7 +9485,6 @@
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz",
 			"integrity": "sha1-mSms32KPwsQQmN6rgqxYDPFJquQ=",
-			"dev": true,
 			"requires": {
 				"boolbase": "~1.0.0"
 			}
@@ -10388,8 +9492,7 @@
 		"num2fraction": {
 			"version": "1.2.2",
 			"resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
-			"integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=",
-			"dev": true
+			"integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4="
 		},
 		"number-is-nan": {
 			"version": "1.0.1",
@@ -10399,14 +9502,12 @@
 		"nwsapi": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.0.1.tgz",
-			"integrity": "sha512-xOJJb7kAAGy6UOklbaIPA0iu/27VMHfAbMUgYJlXz4qRXytIkPGM2vwfbxa+tbaqcqHNsP6RN4eDZlePelWKpQ==",
-			"dev": true
+			"integrity": "sha512-xOJJb7kAAGy6UOklbaIPA0iu/27VMHfAbMUgYJlXz4qRXytIkPGM2vwfbxa+tbaqcqHNsP6RN4eDZlePelWKpQ=="
 		},
 		"oauth-sign": {
 			"version": "0.8.2",
 			"resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
-			"integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=",
-			"dev": true
+			"integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM="
 		},
 		"object-assign": {
 			"version": "4.1.1",
@@ -10417,7 +9518,6 @@
 			"version": "0.1.0",
 			"resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
 			"integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
-			"dev": true,
 			"requires": {
 				"copy-descriptor": "^0.1.0",
 				"define-property": "^0.2.5",
@@ -10428,7 +9528,6 @@
 					"version": "0.2.5",
 					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
 					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-					"dev": true,
 					"requires": {
 						"is-descriptor": "^0.1.0"
 					}
@@ -10438,32 +9537,27 @@
 		"object-filter": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/object-filter/-/object-filter-1.0.2.tgz",
-			"integrity": "sha1-rwt5f/6+r4pSxmN87b6IFs/sG8g=",
-			"dev": true
+			"integrity": "sha1-rwt5f/6+r4pSxmN87b6IFs/sG8g="
 		},
 		"object-inspect": {
 			"version": "1.6.0",
 			"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.6.0.tgz",
-			"integrity": "sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ==",
-			"dev": true
+			"integrity": "sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ=="
 		},
 		"object-is": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/object-is/-/object-is-1.0.1.tgz",
-			"integrity": "sha1-CqYOyZiaCz7Xlc9NBvYs8a1lObY=",
-			"dev": true
+			"integrity": "sha1-CqYOyZiaCz7Xlc9NBvYs8a1lObY="
 		},
 		"object-keys": {
 			"version": "1.0.11",
 			"resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz",
-			"integrity": "sha1-xUYBd4rVYPEULODgG8yotW0TQm0=",
-			"dev": true
+			"integrity": "sha1-xUYBd4rVYPEULODgG8yotW0TQm0="
 		},
 		"object-visit": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
 			"integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
-			"dev": true,
 			"requires": {
 				"isobject": "^3.0.0"
 			}
@@ -10472,7 +9566,6 @@
 			"version": "4.1.0",
 			"resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
 			"integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
-			"dev": true,
 			"requires": {
 				"define-properties": "^1.1.2",
 				"function-bind": "^1.1.1",
@@ -10484,7 +9577,6 @@
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.0.4.tgz",
 			"integrity": "sha1-G/mk3SKI9bM/Opk9JXZh8F0WGl8=",
-			"dev": true,
 			"requires": {
 				"define-properties": "^1.1.2",
 				"es-abstract": "^1.6.1",
@@ -10496,7 +9588,6 @@
 			"version": "2.0.3",
 			"resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz",
 			"integrity": "sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=",
-			"dev": true,
 			"requires": {
 				"define-properties": "^1.1.2",
 				"es-abstract": "^1.5.1"
@@ -10506,7 +9597,6 @@
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
 			"integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
-			"dev": true,
 			"requires": {
 				"for-own": "^0.1.4",
 				"is-extendable": "^0.1.1"
@@ -10516,7 +9606,6 @@
 			"version": "1.3.0",
 			"resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
 			"integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
-			"dev": true,
 			"requires": {
 				"isobject": "^3.0.1"
 			}
@@ -10525,7 +9614,6 @@
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/object.values/-/object.values-1.0.4.tgz",
 			"integrity": "sha1-5STaCbT2b/Bd9FdUbscqyZ8TBpo=",
-			"dev": true,
 			"requires": {
 				"define-properties": "^1.1.2",
 				"es-abstract": "^1.6.1",
@@ -10562,7 +9650,6 @@
 			"version": "0.8.2",
 			"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
 			"integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
-			"dev": true,
 			"requires": {
 				"deep-is": "~0.1.3",
 				"fast-levenshtein": "~2.0.4",
@@ -10575,8 +9662,7 @@
 				"wordwrap": {
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
-					"integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
-					"dev": true
+					"integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus="
 				}
 			}
 		},
@@ -10584,7 +9670,6 @@
 			"version": "0.2.3",
 			"resolved": "https://registry.npmjs.org/ora/-/ora-0.2.3.tgz",
 			"integrity": "sha1-N1J9Igrc1Tw5tzVx11QVbV22V6Q=",
-			"dev": true,
 			"requires": {
 				"chalk": "^1.1.1",
 				"cli-cursor": "^1.0.2",
@@ -10595,14 +9680,12 @@
 				"ansi-styles": {
 					"version": "2.2.1",
 					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-					"dev": true
+					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
 				},
 				"chalk": {
 					"version": "1.1.3",
 					"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
 					"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-					"dev": true,
 					"requires": {
 						"ansi-styles": "^2.2.1",
 						"escape-string-regexp": "^1.0.2",
@@ -10615,7 +9698,6 @@
 					"version": "1.0.2",
 					"resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz",
 					"integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=",
-					"dev": true,
 					"requires": {
 						"restore-cursor": "^1.0.1"
 					}
@@ -10623,14 +9705,12 @@
 				"onetime": {
 					"version": "1.1.0",
 					"resolved": "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
-					"integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=",
-					"dev": true
+					"integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k="
 				},
 				"restore-cursor": {
 					"version": "1.0.1",
 					"resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz",
 					"integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=",
-					"dev": true,
 					"requires": {
 						"exit-hook": "^1.0.0",
 						"onetime": "^1.0.0"
@@ -10639,22 +9719,19 @@
 				"supports-color": {
 					"version": "2.0.0",
 					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-					"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-					"dev": true
+					"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
 				}
 			}
 		},
 		"os-browserify": {
 			"version": "0.3.0",
 			"resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
-			"integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=",
-			"dev": true
+			"integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc="
 		},
 		"os-homedir": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-			"integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
-			"dev": true
+			"integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
 		},
 		"os-locale": {
 			"version": "2.1.0",
@@ -10691,7 +9768,6 @@
 			"version": "0.1.5",
 			"resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
 			"integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
-			"dev": true,
 			"requires": {
 				"os-homedir": "^1.0.0",
 				"os-tmpdir": "^1.0.0"
@@ -10700,14 +9776,12 @@
 		"p-cancelable": {
 			"version": "0.4.1",
 			"resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.4.1.tgz",
-			"integrity": "sha512-HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ==",
-			"dev": true
+			"integrity": "sha512-HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ=="
 		},
 		"p-each-series": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-1.0.0.tgz",
 			"integrity": "sha1-kw89Et0fUOdDRFeiLNbwSsatf3E=",
-			"dev": true,
 			"requires": {
 				"p-reduce": "^1.0.0"
 			}
@@ -10720,14 +9794,12 @@
 		"p-is-promise": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz",
-			"integrity": "sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4=",
-			"dev": true
+			"integrity": "sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4="
 		},
 		"p-lazy": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/p-lazy/-/p-lazy-1.0.0.tgz",
-			"integrity": "sha1-7FPIAvLuOsKPFmzILQsrAt4nqDU=",
-			"dev": true
+			"integrity": "sha1-7FPIAvLuOsKPFmzILQsrAt4nqDU="
 		},
 		"p-limit": {
 			"version": "1.2.0",
@@ -10748,20 +9820,17 @@
 		"p-map": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz",
-			"integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==",
-			"dev": true
+			"integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA=="
 		},
 		"p-reduce": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/p-reduce/-/p-reduce-1.0.0.tgz",
-			"integrity": "sha1-GMKw3ZNqRpClKfgjH1ig/bakffo=",
-			"dev": true
+			"integrity": "sha1-GMKw3ZNqRpClKfgjH1ig/bakffo="
 		},
 		"p-timeout": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-2.0.1.tgz",
 			"integrity": "sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==",
-			"dev": true,
 			"requires": {
 				"p-finally": "^1.0.0"
 			}
@@ -10785,14 +9854,12 @@
 		"pako": {
 			"version": "1.0.6",
 			"resolved": "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz",
-			"integrity": "sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg==",
-			"dev": true
+			"integrity": "sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg=="
 		},
 		"parallel-transform": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz",
 			"integrity": "sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=",
-			"dev": true,
 			"requires": {
 				"cyclist": "~0.2.2",
 				"inherits": "^2.0.3",
@@ -10803,7 +9870,6 @@
 			"version": "5.1.1",
 			"resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz",
 			"integrity": "sha512-KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw==",
-			"dev": true,
 			"requires": {
 				"asn1.js": "^4.0.0",
 				"browserify-aes": "^1.0.0",
@@ -10821,7 +9887,6 @@
 			"version": "3.0.4",
 			"resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
 			"integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=",
-			"dev": true,
 			"requires": {
 				"glob-base": "^0.3.0",
 				"is-dotfile": "^1.0.0",
@@ -10832,14 +9897,12 @@
 				"is-extglob": {
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-					"integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-					"dev": true
+					"integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA="
 				},
 				"is-glob": {
 					"version": "2.0.1",
 					"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
 					"integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-					"dev": true,
 					"requires": {
 						"is-extglob": "^1.0.0"
 					}
@@ -10858,14 +9921,12 @@
 		"parse-passwd": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
-			"integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=",
-			"dev": true
+			"integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY="
 		},
 		"parse5": {
 			"version": "3.0.3",
 			"resolved": "https://registry.npmjs.org/parse5/-/parse5-3.0.3.tgz",
 			"integrity": "sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA==",
-			"dev": true,
 			"requires": {
 				"@types/node": "*"
 			}
@@ -10873,14 +9934,12 @@
 		"pascalcase": {
 			"version": "0.1.1",
 			"resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
-			"integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
-			"dev": true
+			"integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ="
 		},
 		"path-browserify": {
 			"version": "0.0.0",
 			"resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz",
-			"integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=",
-			"dev": true
+			"integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo="
 		},
 		"path-dirname": {
 			"version": "1.0.2",
@@ -10900,8 +9959,7 @@
 		"path-is-inside": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
-			"integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=",
-			"dev": true
+			"integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM="
 		},
 		"path-key": {
 			"version": "2.0.1",
@@ -10925,7 +9983,6 @@
 			"version": "3.0.16",
 			"resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.16.tgz",
 			"integrity": "sha512-y4CXP3thSxqf7c0qmOF+9UeOTrifiVTIM+u7NWlq+PRsHbr7r7dpCmvzrZxa96JJUNi0Y5w9VqG5ZNeCVMoDcA==",
-			"dev": true,
 			"requires": {
 				"create-hash": "^1.1.2",
 				"create-hmac": "^1.1.4",
@@ -10937,14 +9994,12 @@
 		"pegjs": {
 			"version": "0.10.0",
 			"resolved": "https://registry.npmjs.org/pegjs/-/pegjs-0.10.0.tgz",
-			"integrity": "sha1-z4uvrm7d/0tafvsYUmnqr0YQ3b0=",
-			"dev": true
+			"integrity": "sha1-z4uvrm7d/0tafvsYUmnqr0YQ3b0="
 		},
 		"pegjs-loader": {
 			"version": "0.5.4",
 			"resolved": "https://registry.npmjs.org/pegjs-loader/-/pegjs-loader-0.5.4.tgz",
 			"integrity": "sha512-ViH8WwUkc/N8H59zuarORrgCi7uxn+gDIq+Ydriw1GFJi/oUg2xvhsgDDujO6dAxRsxXMgqWESx6TKYIqHorqA==",
-			"dev": true,
 			"requires": {
 				"loader-utils": "^0.2.5"
 			},
@@ -10953,7 +10008,6 @@
 					"version": "0.2.17",
 					"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz",
 					"integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=",
-					"dev": true,
 					"requires": {
 						"big.js": "^3.1.3",
 						"emojis-list": "^2.0.0",
@@ -10966,20 +10020,17 @@
 		"pend": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
-			"integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
-			"dev": true
+			"integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA="
 		},
 		"performance-now": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-			"integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
-			"dev": true
+			"integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
 		},
 		"phpegjs": {
 			"version": "1.0.0-beta7",
 			"resolved": "https://registry.npmjs.org/phpegjs/-/phpegjs-1.0.0-beta7.tgz",
-			"integrity": "sha1-uLbthQGYB//Q7+ID4AKj5e2LTZQ=",
-			"dev": true
+			"integrity": "sha1-uLbthQGYB//Q7+ID4AKj5e2LTZQ="
 		},
 		"pify": {
 			"version": "3.0.0",
@@ -11003,7 +10054,6 @@
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
 			"integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
-			"dev": true,
 			"requires": {
 				"find-up": "^2.1.0"
 			}
@@ -11012,7 +10062,6 @@
 			"version": "3.0.1",
 			"resolved": "https://registry.npmjs.org/plur/-/plur-3.0.1.tgz",
 			"integrity": "sha512-lJl0ojUynAM1BZn58Pas2WT/TXeC1+bS+UqShl0x9+49AtOn7DixRXVzaC8qrDOIxNDmepKnLuMTH7NQmkX0PA==",
-			"dev": true,
 			"requires": {
 				"irregular-plurals": "^2.0.0"
 			}
@@ -11020,14 +10069,12 @@
 		"pluralize": {
 			"version": "7.0.0",
 			"resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz",
-			"integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==",
-			"dev": true
+			"integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow=="
 		},
 		"pn": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/pn/-/pn-1.1.0.tgz",
-			"integrity": "sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA==",
-			"dev": true
+			"integrity": "sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA=="
 		},
 		"popper.js": {
 			"version": "1.14.3",
@@ -11037,14 +10084,12 @@
 		"posix-character-classes": {
 			"version": "0.1.1",
 			"resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
-			"integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
-			"dev": true
+			"integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs="
 		},
 		"postcss": {
 			"version": "6.0.22",
 			"resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.22.tgz",
 			"integrity": "sha512-Toc9lLoUASwGqxBSJGTVcOQiDqjK+Z2XlWBg+IgYwQMY9vA2f7iMpXVc1GpPcfTSyM5lkxNo0oDwDRO+wm7XHA==",
-			"dev": true,
 			"requires": {
 				"chalk": "^2.4.1",
 				"source-map": "^0.6.1",
@@ -11054,8 +10099,7 @@
 				"source-map": {
 					"version": "0.6.1",
 					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-					"dev": true
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
 				}
 			}
 		},
@@ -11063,7 +10107,6 @@
 			"version": "5.3.1",
 			"resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-5.3.1.tgz",
 			"integrity": "sha1-d7rnypKK2FcW4v2kLyYb98HWW14=",
-			"dev": true,
 			"requires": {
 				"postcss": "^5.0.2",
 				"postcss-message-helpers": "^2.0.0",
@@ -11073,14 +10116,12 @@
 				"ansi-styles": {
 					"version": "2.2.1",
 					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-					"dev": true
+					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
 				},
 				"chalk": {
 					"version": "1.1.3",
 					"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
 					"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-					"dev": true,
 					"requires": {
 						"ansi-styles": "^2.2.1",
 						"escape-string-regexp": "^1.0.2",
@@ -11092,22 +10133,19 @@
 						"supports-color": {
 							"version": "2.0.0",
 							"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-							"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-							"dev": true
+							"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
 						}
 					}
 				},
 				"has-flag": {
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-					"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-					"dev": true
+					"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
 				},
 				"postcss": {
 					"version": "5.2.18",
 					"resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
 					"integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-					"dev": true,
 					"requires": {
 						"chalk": "^1.1.3",
 						"js-base64": "^2.1.9",
@@ -11118,14 +10156,12 @@
 				"source-map": {
 					"version": "0.5.7",
 					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-					"dev": true
+					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
 				},
 				"supports-color": {
 					"version": "3.2.3",
 					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
 					"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-					"dev": true,
 					"requires": {
 						"has-flag": "^1.0.0"
 					}
@@ -11136,7 +10172,6 @@
 			"version": "4.0.1",
 			"resolved": "https://registry.npmjs.org/postcss-color-function/-/postcss-color-function-4.0.1.tgz",
 			"integrity": "sha1-QCs/LOvD9pR+YY+2vjZU++zvZEQ=",
-			"dev": true,
 			"requires": {
 				"css-color-function": "~1.3.3",
 				"postcss": "^6.0.1",
@@ -11148,7 +10183,6 @@
 			"version": "2.2.2",
 			"resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-2.2.2.tgz",
 			"integrity": "sha1-ZjFBfV8OkJo9fsJrJMio0eT5bks=",
-			"dev": true,
 			"requires": {
 				"colormin": "^1.0.5",
 				"postcss": "^5.0.13",
@@ -11158,14 +10192,12 @@
 				"ansi-styles": {
 					"version": "2.2.1",
 					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-					"dev": true
+					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
 				},
 				"chalk": {
 					"version": "1.1.3",
 					"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
 					"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-					"dev": true,
 					"requires": {
 						"ansi-styles": "^2.2.1",
 						"escape-string-regexp": "^1.0.2",
@@ -11177,22 +10209,19 @@
 						"supports-color": {
 							"version": "2.0.0",
 							"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-							"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-							"dev": true
+							"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
 						}
 					}
 				},
 				"has-flag": {
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-					"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-					"dev": true
+					"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
 				},
 				"postcss": {
 					"version": "5.2.18",
 					"resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
 					"integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-					"dev": true,
 					"requires": {
 						"chalk": "^1.1.3",
 						"js-base64": "^2.1.9",
@@ -11203,14 +10232,12 @@
 				"source-map": {
 					"version": "0.5.7",
 					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-					"dev": true
+					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
 				},
 				"supports-color": {
 					"version": "3.2.3",
 					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
 					"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-					"dev": true,
 					"requires": {
 						"has-flag": "^1.0.0"
 					}
@@ -11221,7 +10248,6 @@
 			"version": "2.6.1",
 			"resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-2.6.1.tgz",
 			"integrity": "sha1-u9hZPFwf0uPRwyK7kl3K6Nrk1i0=",
-			"dev": true,
 			"requires": {
 				"postcss": "^5.0.11",
 				"postcss-value-parser": "^3.1.2"
@@ -11230,14 +10256,12 @@
 				"ansi-styles": {
 					"version": "2.2.1",
 					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-					"dev": true
+					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
 				},
 				"chalk": {
 					"version": "1.1.3",
 					"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
 					"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-					"dev": true,
 					"requires": {
 						"ansi-styles": "^2.2.1",
 						"escape-string-regexp": "^1.0.2",
@@ -11249,22 +10273,19 @@
 						"supports-color": {
 							"version": "2.0.0",
 							"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-							"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-							"dev": true
+							"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
 						}
 					}
 				},
 				"has-flag": {
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-					"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-					"dev": true
+					"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
 				},
 				"postcss": {
 					"version": "5.2.18",
 					"resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
 					"integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-					"dev": true,
 					"requires": {
 						"chalk": "^1.1.3",
 						"js-base64": "^2.1.9",
@@ -11275,14 +10296,12 @@
 				"source-map": {
 					"version": "0.5.7",
 					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-					"dev": true
+					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
 				},
 				"supports-color": {
 					"version": "3.2.3",
 					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
 					"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-					"dev": true,
 					"requires": {
 						"has-flag": "^1.0.0"
 					}
@@ -11293,7 +10312,6 @@
 			"version": "2.0.4",
 			"resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-2.0.4.tgz",
 			"integrity": "sha1-vv6J+v1bPazlzM5Rt2uBUUvgDj0=",
-			"dev": true,
 			"requires": {
 				"postcss": "^5.0.14"
 			},
@@ -11301,14 +10319,12 @@
 				"ansi-styles": {
 					"version": "2.2.1",
 					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-					"dev": true
+					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
 				},
 				"chalk": {
 					"version": "1.1.3",
 					"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
 					"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-					"dev": true,
 					"requires": {
 						"ansi-styles": "^2.2.1",
 						"escape-string-regexp": "^1.0.2",
@@ -11320,22 +10336,19 @@
 						"supports-color": {
 							"version": "2.0.0",
 							"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-							"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-							"dev": true
+							"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
 						}
 					}
 				},
 				"has-flag": {
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-					"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-					"dev": true
+					"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
 				},
 				"postcss": {
 					"version": "5.2.18",
 					"resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
 					"integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-					"dev": true,
 					"requires": {
 						"chalk": "^1.1.3",
 						"js-base64": "^2.1.9",
@@ -11346,14 +10359,12 @@
 				"source-map": {
 					"version": "0.5.7",
 					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-					"dev": true
+					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
 				},
 				"supports-color": {
 					"version": "3.2.3",
 					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
 					"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-					"dev": true,
 					"requires": {
 						"has-flag": "^1.0.0"
 					}
@@ -11364,7 +10375,6 @@
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-2.1.0.tgz",
 			"integrity": "sha1-uavye4isGIFYpesSq8riAmO5GTI=",
-			"dev": true,
 			"requires": {
 				"postcss": "^5.0.4"
 			},
@@ -11372,14 +10382,12 @@
 				"ansi-styles": {
 					"version": "2.2.1",
 					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-					"dev": true
+					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
 				},
 				"chalk": {
 					"version": "1.1.3",
 					"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
 					"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-					"dev": true,
 					"requires": {
 						"ansi-styles": "^2.2.1",
 						"escape-string-regexp": "^1.0.2",
@@ -11391,22 +10399,19 @@
 						"supports-color": {
 							"version": "2.0.0",
 							"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-							"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-							"dev": true
+							"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
 						}
 					}
 				},
 				"has-flag": {
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-					"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-					"dev": true
+					"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
 				},
 				"postcss": {
 					"version": "5.2.18",
 					"resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
 					"integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-					"dev": true,
 					"requires": {
 						"chalk": "^1.1.3",
 						"js-base64": "^2.1.9",
@@ -11417,14 +10422,12 @@
 				"source-map": {
 					"version": "0.5.7",
 					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-					"dev": true
+					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
 				},
 				"supports-color": {
 					"version": "3.2.3",
 					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
 					"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-					"dev": true,
 					"requires": {
 						"has-flag": "^1.0.0"
 					}
@@ -11435,7 +10438,6 @@
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-2.1.0.tgz",
 			"integrity": "sha1-0rS9nVztXr2Nyt52QMfXzX9PkrU=",
-			"dev": true,
 			"requires": {
 				"postcss": "^5.0.14"
 			},
@@ -11443,14 +10445,12 @@
 				"ansi-styles": {
 					"version": "2.2.1",
 					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-					"dev": true
+					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
 				},
 				"chalk": {
 					"version": "1.1.3",
 					"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
 					"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-					"dev": true,
 					"requires": {
 						"ansi-styles": "^2.2.1",
 						"escape-string-regexp": "^1.0.2",
@@ -11462,22 +10462,19 @@
 						"supports-color": {
 							"version": "2.0.0",
 							"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-							"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-							"dev": true
+							"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
 						}
 					}
 				},
 				"has-flag": {
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-					"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-					"dev": true
+					"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
 				},
 				"postcss": {
 					"version": "5.2.18",
 					"resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
 					"integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-					"dev": true,
 					"requires": {
 						"chalk": "^1.1.3",
 						"js-base64": "^2.1.9",
@@ -11488,14 +10485,12 @@
 				"source-map": {
 					"version": "0.5.7",
 					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-					"dev": true
+					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
 				},
 				"supports-color": {
 					"version": "3.2.3",
 					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
 					"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-					"dev": true,
 					"requires": {
 						"has-flag": "^1.0.0"
 					}
@@ -11506,7 +10501,6 @@
 			"version": "0.1.1",
 			"resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-0.1.1.tgz",
 			"integrity": "sha1-ix6vVU9ob7KIzYdMVWZ7CqNmjVg=",
-			"dev": true,
 			"requires": {
 				"postcss": "^5.0.16"
 			},
@@ -11514,14 +10508,12 @@
 				"ansi-styles": {
 					"version": "2.2.1",
 					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-					"dev": true
+					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
 				},
 				"chalk": {
 					"version": "1.1.3",
 					"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
 					"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-					"dev": true,
 					"requires": {
 						"ansi-styles": "^2.2.1",
 						"escape-string-regexp": "^1.0.2",
@@ -11533,22 +10525,19 @@
 						"supports-color": {
 							"version": "2.0.0",
 							"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-							"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-							"dev": true
+							"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
 						}
 					}
 				},
 				"has-flag": {
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-					"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-					"dev": true
+					"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
 				},
 				"postcss": {
 					"version": "5.2.18",
 					"resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
 					"integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-					"dev": true,
 					"requires": {
 						"chalk": "^1.1.3",
 						"js-base64": "^2.1.9",
@@ -11559,14 +10548,12 @@
 				"source-map": {
 					"version": "0.5.7",
 					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-					"dev": true
+					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
 				},
 				"supports-color": {
 					"version": "3.2.3",
 					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
 					"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-					"dev": true,
 					"requires": {
 						"has-flag": "^1.0.0"
 					}
@@ -11577,7 +10564,6 @@
 			"version": "2.2.3",
 			"resolved": "https://registry.npmjs.org/postcss-discard-unused/-/postcss-discard-unused-2.2.3.tgz",
 			"integrity": "sha1-vOMLLMWR/8Y0Mitfs0ZLbZNPRDM=",
-			"dev": true,
 			"requires": {
 				"postcss": "^5.0.14",
 				"uniqs": "^2.0.0"
@@ -11586,14 +10572,12 @@
 				"ansi-styles": {
 					"version": "2.2.1",
 					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-					"dev": true
+					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
 				},
 				"chalk": {
 					"version": "1.1.3",
 					"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
 					"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-					"dev": true,
 					"requires": {
 						"ansi-styles": "^2.2.1",
 						"escape-string-regexp": "^1.0.2",
@@ -11605,22 +10589,19 @@
 						"supports-color": {
 							"version": "2.0.0",
 							"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-							"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-							"dev": true
+							"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
 						}
 					}
 				},
 				"has-flag": {
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-					"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-					"dev": true
+					"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
 				},
 				"postcss": {
 					"version": "5.2.18",
 					"resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
 					"integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-					"dev": true,
 					"requires": {
 						"chalk": "^1.1.3",
 						"js-base64": "^2.1.9",
@@ -11631,14 +10612,12 @@
 				"source-map": {
 					"version": "0.5.7",
 					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-					"dev": true
+					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
 				},
 				"supports-color": {
 					"version": "3.2.3",
 					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
 					"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-					"dev": true,
 					"requires": {
 						"has-flag": "^1.0.0"
 					}
@@ -11649,7 +10628,6 @@
 			"version": "2.0.3",
 			"resolved": "https://registry.npmjs.org/postcss-filter-plugins/-/postcss-filter-plugins-2.0.3.tgz",
 			"integrity": "sha512-T53GVFsdinJhgwm7rg1BzbeBRomOg9y5MBVhGcsV0CxurUdVj1UlPdKtn7aqYA/c/QVkzKMjq2bSV5dKG5+AwQ==",
-			"dev": true,
 			"requires": {
 				"postcss": "^5.0.4"
 			},
@@ -11657,14 +10635,12 @@
 				"ansi-styles": {
 					"version": "2.2.1",
 					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-					"dev": true
+					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
 				},
 				"chalk": {
 					"version": "1.1.3",
 					"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
 					"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-					"dev": true,
 					"requires": {
 						"ansi-styles": "^2.2.1",
 						"escape-string-regexp": "^1.0.2",
@@ -11676,22 +10652,19 @@
 						"supports-color": {
 							"version": "2.0.0",
 							"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-							"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-							"dev": true
+							"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
 						}
 					}
 				},
 				"has-flag": {
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-					"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-					"dev": true
+					"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
 				},
 				"postcss": {
 					"version": "5.2.18",
 					"resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
 					"integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-					"dev": true,
 					"requires": {
 						"chalk": "^1.1.3",
 						"js-base64": "^2.1.9",
@@ -11702,14 +10675,12 @@
 				"source-map": {
 					"version": "0.5.7",
 					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-					"dev": true
+					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
 				},
 				"supports-color": {
 					"version": "3.2.3",
 					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
 					"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-					"dev": true,
 					"requires": {
 						"has-flag": "^1.0.0"
 					}
@@ -11720,7 +10691,6 @@
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-1.2.0.tgz",
 			"integrity": "sha1-U56a/J3chiASHr+djDZz4M5Q0oo=",
-			"dev": true,
 			"requires": {
 				"cosmiconfig": "^2.1.0",
 				"object-assign": "^4.1.0",
@@ -11732,7 +10702,6 @@
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/postcss-load-options/-/postcss-load-options-1.2.0.tgz",
 			"integrity": "sha1-sJixVZ3awt8EvAuzdfmaXP4rbYw=",
-			"dev": true,
 			"requires": {
 				"cosmiconfig": "^2.1.0",
 				"object-assign": "^4.1.0"
@@ -11742,7 +10711,6 @@
 			"version": "2.3.0",
 			"resolved": "https://registry.npmjs.org/postcss-load-plugins/-/postcss-load-plugins-2.3.0.tgz",
 			"integrity": "sha1-dFdoEWWZrKLwCfrUJrABdQSdjZI=",
-			"dev": true,
 			"requires": {
 				"cosmiconfig": "^2.1.1",
 				"object-assign": "^4.1.0"
@@ -11752,7 +10720,6 @@
 			"version": "2.1.3",
 			"resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-2.1.3.tgz",
 			"integrity": "sha512-RuBcNE8rjCkIB0IsbmkGFRmQJTeQJfCI88E0VTarPNTvaNSv9OFv1DvTwgtAN/qlzyiELsmmmtX/tEzKp/cdug==",
-			"dev": true,
 			"requires": {
 				"loader-utils": "^1.1.0",
 				"postcss": "^6.0.0",
@@ -11764,7 +10731,6 @@
 			"version": "2.1.7",
 			"resolved": "https://registry.npmjs.org/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz",
 			"integrity": "sha1-TFUwMTwI4dWzu/PSu8dH4njuonA=",
-			"dev": true,
 			"requires": {
 				"has": "^1.0.1",
 				"postcss": "^5.0.10",
@@ -11774,14 +10740,12 @@
 				"ansi-styles": {
 					"version": "2.2.1",
 					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-					"dev": true
+					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
 				},
 				"chalk": {
 					"version": "1.1.3",
 					"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
 					"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-					"dev": true,
 					"requires": {
 						"ansi-styles": "^2.2.1",
 						"escape-string-regexp": "^1.0.2",
@@ -11793,22 +10757,19 @@
 						"supports-color": {
 							"version": "2.0.0",
 							"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-							"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-							"dev": true
+							"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
 						}
 					}
 				},
 				"has-flag": {
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-					"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-					"dev": true
+					"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
 				},
 				"postcss": {
 					"version": "5.2.18",
 					"resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
 					"integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-					"dev": true,
 					"requires": {
 						"chalk": "^1.1.3",
 						"js-base64": "^2.1.9",
@@ -11819,14 +10780,12 @@
 				"source-map": {
 					"version": "0.5.7",
 					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-					"dev": true
+					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
 				},
 				"supports-color": {
 					"version": "3.2.3",
 					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
 					"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-					"dev": true,
 					"requires": {
 						"has-flag": "^1.0.0"
 					}
@@ -11837,7 +10796,6 @@
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-2.0.2.tgz",
 			"integrity": "sha1-I9kM0Sewp3mUkVMyc5A0oaTz1lg=",
-			"dev": true,
 			"requires": {
 				"postcss": "^5.0.4"
 			},
@@ -11845,14 +10803,12 @@
 				"ansi-styles": {
 					"version": "2.2.1",
 					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-					"dev": true
+					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
 				},
 				"chalk": {
 					"version": "1.1.3",
 					"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
 					"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-					"dev": true,
 					"requires": {
 						"ansi-styles": "^2.2.1",
 						"escape-string-regexp": "^1.0.2",
@@ -11864,22 +10820,19 @@
 						"supports-color": {
 							"version": "2.0.0",
 							"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-							"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-							"dev": true
+							"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
 						}
 					}
 				},
 				"has-flag": {
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-					"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-					"dev": true
+					"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
 				},
 				"postcss": {
 					"version": "5.2.18",
 					"resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
 					"integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-					"dev": true,
 					"requires": {
 						"chalk": "^1.1.3",
 						"js-base64": "^2.1.9",
@@ -11890,14 +10843,12 @@
 				"source-map": {
 					"version": "0.5.7",
 					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-					"dev": true
+					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
 				},
 				"supports-color": {
 					"version": "3.2.3",
 					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
 					"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-					"dev": true,
 					"requires": {
 						"has-flag": "^1.0.0"
 					}
@@ -11908,7 +10859,6 @@
 			"version": "2.1.2",
 			"resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-2.1.2.tgz",
 			"integrity": "sha1-0d9d+qexrMO+VT8OnhDofGG19yE=",
-			"dev": true,
 			"requires": {
 				"browserslist": "^1.5.2",
 				"caniuse-api": "^1.5.2",
@@ -11920,14 +10870,12 @@
 				"ansi-styles": {
 					"version": "2.2.1",
 					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-					"dev": true
+					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
 				},
 				"browserslist": {
 					"version": "1.7.7",
 					"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz",
 					"integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
-					"dev": true,
 					"requires": {
 						"caniuse-db": "^1.0.30000639",
 						"electron-to-chromium": "^1.2.7"
@@ -11937,7 +10885,6 @@
 					"version": "1.1.3",
 					"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
 					"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-					"dev": true,
 					"requires": {
 						"ansi-styles": "^2.2.1",
 						"escape-string-regexp": "^1.0.2",
@@ -11949,22 +10896,19 @@
 						"supports-color": {
 							"version": "2.0.0",
 							"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-							"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-							"dev": true
+							"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
 						}
 					}
 				},
 				"has-flag": {
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-					"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-					"dev": true
+					"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
 				},
 				"postcss": {
 					"version": "5.2.18",
 					"resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
 					"integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-					"dev": true,
 					"requires": {
 						"chalk": "^1.1.3",
 						"js-base64": "^2.1.9",
@@ -11975,14 +10919,12 @@
 				"source-map": {
 					"version": "0.5.7",
 					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-					"dev": true
+					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
 				},
 				"supports-color": {
 					"version": "3.2.3",
 					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
 					"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-					"dev": true,
 					"requires": {
 						"has-flag": "^1.0.0"
 					}
@@ -11992,14 +10934,12 @@
 		"postcss-message-helpers": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz",
-			"integrity": "sha1-pPL0+rbk/gAvCu0ABHjN9S+bpg4=",
-			"dev": true
+			"integrity": "sha1-pPL0+rbk/gAvCu0ABHjN9S+bpg4="
 		},
 		"postcss-minify-font-values": {
 			"version": "1.0.5",
 			"resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-1.0.5.tgz",
 			"integrity": "sha1-S1jttWZB66fIR0qzUmyv17vey2k=",
-			"dev": true,
 			"requires": {
 				"object-assign": "^4.0.1",
 				"postcss": "^5.0.4",
@@ -12009,14 +10949,12 @@
 				"ansi-styles": {
 					"version": "2.2.1",
 					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-					"dev": true
+					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
 				},
 				"chalk": {
 					"version": "1.1.3",
 					"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
 					"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-					"dev": true,
 					"requires": {
 						"ansi-styles": "^2.2.1",
 						"escape-string-regexp": "^1.0.2",
@@ -12028,22 +10966,19 @@
 						"supports-color": {
 							"version": "2.0.0",
 							"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-							"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-							"dev": true
+							"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
 						}
 					}
 				},
 				"has-flag": {
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-					"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-					"dev": true
+					"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
 				},
 				"postcss": {
 					"version": "5.2.18",
 					"resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
 					"integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-					"dev": true,
 					"requires": {
 						"chalk": "^1.1.3",
 						"js-base64": "^2.1.9",
@@ -12054,14 +10989,12 @@
 				"source-map": {
 					"version": "0.5.7",
 					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-					"dev": true
+					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
 				},
 				"supports-color": {
 					"version": "3.2.3",
 					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
 					"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-					"dev": true,
 					"requires": {
 						"has-flag": "^1.0.0"
 					}
@@ -12072,7 +11005,6 @@
 			"version": "1.0.5",
 			"resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-1.0.5.tgz",
 			"integrity": "sha1-Xb2hE3NwP4PPtKPqOIHY11/15uE=",
-			"dev": true,
 			"requires": {
 				"postcss": "^5.0.12",
 				"postcss-value-parser": "^3.3.0"
@@ -12081,14 +11013,12 @@
 				"ansi-styles": {
 					"version": "2.2.1",
 					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-					"dev": true
+					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
 				},
 				"chalk": {
 					"version": "1.1.3",
 					"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
 					"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-					"dev": true,
 					"requires": {
 						"ansi-styles": "^2.2.1",
 						"escape-string-regexp": "^1.0.2",
@@ -12100,22 +11030,19 @@
 						"supports-color": {
 							"version": "2.0.0",
 							"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-							"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-							"dev": true
+							"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
 						}
 					}
 				},
 				"has-flag": {
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-					"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-					"dev": true
+					"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
 				},
 				"postcss": {
 					"version": "5.2.18",
 					"resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
 					"integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-					"dev": true,
 					"requires": {
 						"chalk": "^1.1.3",
 						"js-base64": "^2.1.9",
@@ -12126,14 +11053,12 @@
 				"source-map": {
 					"version": "0.5.7",
 					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-					"dev": true
+					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
 				},
 				"supports-color": {
 					"version": "3.2.3",
 					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
 					"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-					"dev": true,
 					"requires": {
 						"has-flag": "^1.0.0"
 					}
@@ -12144,7 +11069,6 @@
 			"version": "1.2.2",
 			"resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-1.2.2.tgz",
 			"integrity": "sha1-rSzgcTc7lDs9kwo/pZo1jCjW8fM=",
-			"dev": true,
 			"requires": {
 				"alphanum-sort": "^1.0.1",
 				"postcss": "^5.0.2",
@@ -12155,14 +11079,12 @@
 				"ansi-styles": {
 					"version": "2.2.1",
 					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-					"dev": true
+					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
 				},
 				"chalk": {
 					"version": "1.1.3",
 					"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
 					"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-					"dev": true,
 					"requires": {
 						"ansi-styles": "^2.2.1",
 						"escape-string-regexp": "^1.0.2",
@@ -12174,22 +11096,19 @@
 						"supports-color": {
 							"version": "2.0.0",
 							"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-							"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-							"dev": true
+							"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
 						}
 					}
 				},
 				"has-flag": {
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-					"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-					"dev": true
+					"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
 				},
 				"postcss": {
 					"version": "5.2.18",
 					"resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
 					"integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-					"dev": true,
 					"requires": {
 						"chalk": "^1.1.3",
 						"js-base64": "^2.1.9",
@@ -12200,14 +11119,12 @@
 				"source-map": {
 					"version": "0.5.7",
 					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-					"dev": true
+					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
 				},
 				"supports-color": {
 					"version": "3.2.3",
 					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
 					"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-					"dev": true,
 					"requires": {
 						"has-flag": "^1.0.0"
 					}
@@ -12218,7 +11135,6 @@
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-2.1.1.tgz",
 			"integrity": "sha1-ssapjAByz5G5MtGkllCBFDEXNb8=",
-			"dev": true,
 			"requires": {
 				"alphanum-sort": "^1.0.2",
 				"has": "^1.0.1",
@@ -12229,14 +11145,12 @@
 				"ansi-styles": {
 					"version": "2.2.1",
 					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-					"dev": true
+					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
 				},
 				"chalk": {
 					"version": "1.1.3",
 					"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
 					"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-					"dev": true,
 					"requires": {
 						"ansi-styles": "^2.2.1",
 						"escape-string-regexp": "^1.0.2",
@@ -12248,22 +11162,19 @@
 						"supports-color": {
 							"version": "2.0.0",
 							"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-							"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-							"dev": true
+							"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
 						}
 					}
 				},
 				"has-flag": {
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-					"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-					"dev": true
+					"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
 				},
 				"postcss": {
 					"version": "5.2.18",
 					"resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
 					"integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-					"dev": true,
 					"requires": {
 						"chalk": "^1.1.3",
 						"js-base64": "^2.1.9",
@@ -12274,14 +11185,12 @@
 				"source-map": {
 					"version": "0.5.7",
 					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-					"dev": true
+					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
 				},
 				"supports-color": {
 					"version": "3.2.3",
 					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
 					"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-					"dev": true,
 					"requires": {
 						"has-flag": "^1.0.0"
 					}
@@ -12292,7 +11201,6 @@
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-1.1.1.tgz",
 			"integrity": "sha1-757nEhLX/nWceO0WL2HtYrXLk/E=",
-			"dev": true,
 			"requires": {
 				"postcss": "^5.0.5"
 			},
@@ -12300,14 +11208,12 @@
 				"ansi-styles": {
 					"version": "2.2.1",
 					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-					"dev": true
+					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
 				},
 				"chalk": {
 					"version": "1.1.3",
 					"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
 					"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-					"dev": true,
 					"requires": {
 						"ansi-styles": "^2.2.1",
 						"escape-string-regexp": "^1.0.2",
@@ -12319,22 +11225,19 @@
 						"supports-color": {
 							"version": "2.0.0",
 							"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-							"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-							"dev": true
+							"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
 						}
 					}
 				},
 				"has-flag": {
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-					"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-					"dev": true
+					"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
 				},
 				"postcss": {
 					"version": "5.2.18",
 					"resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
 					"integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-					"dev": true,
 					"requires": {
 						"chalk": "^1.1.3",
 						"js-base64": "^2.1.9",
@@ -12345,14 +11248,12 @@
 				"source-map": {
 					"version": "0.5.7",
 					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-					"dev": true
+					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
 				},
 				"supports-color": {
 					"version": "3.2.3",
 					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
 					"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-					"dev": true,
 					"requires": {
 						"has-flag": "^1.0.0"
 					}
@@ -12363,7 +11264,6 @@
 			"version": "3.0.8",
 			"resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-3.0.8.tgz",
 			"integrity": "sha1-EI90s/L82viRov+j6kWSJ5/HgiI=",
-			"dev": true,
 			"requires": {
 				"is-absolute-url": "^2.0.0",
 				"normalize-url": "^1.4.0",
@@ -12374,14 +11274,12 @@
 				"ansi-styles": {
 					"version": "2.2.1",
 					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-					"dev": true
+					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
 				},
 				"chalk": {
 					"version": "1.1.3",
 					"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
 					"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-					"dev": true,
 					"requires": {
 						"ansi-styles": "^2.2.1",
 						"escape-string-regexp": "^1.0.2",
@@ -12393,22 +11291,19 @@
 						"supports-color": {
 							"version": "2.0.0",
 							"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-							"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-							"dev": true
+							"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
 						}
 					}
 				},
 				"has-flag": {
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-					"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-					"dev": true
+					"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
 				},
 				"normalize-url": {
 					"version": "1.9.1",
 					"resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz",
 					"integrity": "sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=",
-					"dev": true,
 					"requires": {
 						"object-assign": "^4.0.1",
 						"prepend-http": "^1.0.0",
@@ -12420,7 +11315,6 @@
 					"version": "5.2.18",
 					"resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
 					"integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-					"dev": true,
 					"requires": {
 						"chalk": "^1.1.3",
 						"js-base64": "^2.1.9",
@@ -12432,7 +11326,6 @@
 					"version": "4.3.4",
 					"resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz",
 					"integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=",
-					"dev": true,
 					"requires": {
 						"object-assign": "^4.1.0",
 						"strict-uri-encode": "^1.0.0"
@@ -12442,7 +11335,6 @@
 					"version": "1.1.2",
 					"resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz",
 					"integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=",
-					"dev": true,
 					"requires": {
 						"is-plain-obj": "^1.0.0"
 					}
@@ -12450,14 +11342,12 @@
 				"source-map": {
 					"version": "0.5.7",
 					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-					"dev": true
+					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
 				},
 				"supports-color": {
 					"version": "3.2.3",
 					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
 					"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-					"dev": true,
 					"requires": {
 						"has-flag": "^1.0.0"
 					}
@@ -12468,7 +11358,6 @@
 			"version": "2.2.3",
 			"resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-2.2.3.tgz",
 			"integrity": "sha1-7sbCpntsQSqNsgQud/6NpD+VwR0=",
-			"dev": true,
 			"requires": {
 				"postcss": "^5.0.4",
 				"postcss-value-parser": "^3.0.1"
@@ -12477,14 +11366,12 @@
 				"ansi-styles": {
 					"version": "2.2.1",
 					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-					"dev": true
+					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
 				},
 				"chalk": {
 					"version": "1.1.3",
 					"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
 					"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-					"dev": true,
 					"requires": {
 						"ansi-styles": "^2.2.1",
 						"escape-string-regexp": "^1.0.2",
@@ -12496,22 +11383,19 @@
 						"supports-color": {
 							"version": "2.0.0",
 							"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-							"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-							"dev": true
+							"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
 						}
 					}
 				},
 				"has-flag": {
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-					"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-					"dev": true
+					"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
 				},
 				"postcss": {
 					"version": "5.2.18",
 					"resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
 					"integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-					"dev": true,
 					"requires": {
 						"chalk": "^1.1.3",
 						"js-base64": "^2.1.9",
@@ -12522,14 +11406,12 @@
 				"source-map": {
 					"version": "0.5.7",
 					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-					"dev": true
+					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
 				},
 				"supports-color": {
 					"version": "3.2.3",
 					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
 					"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-					"dev": true,
 					"requires": {
 						"has-flag": "^1.0.0"
 					}
@@ -12540,7 +11422,6 @@
 			"version": "2.4.0",
 			"resolved": "https://registry.npmjs.org/postcss-reduce-idents/-/postcss-reduce-idents-2.4.0.tgz",
 			"integrity": "sha1-wsbSDMlYKE9qv75j92Cb9AkFmtM=",
-			"dev": true,
 			"requires": {
 				"postcss": "^5.0.4",
 				"postcss-value-parser": "^3.0.2"
@@ -12549,14 +11430,12 @@
 				"ansi-styles": {
 					"version": "2.2.1",
 					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-					"dev": true
+					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
 				},
 				"chalk": {
 					"version": "1.1.3",
 					"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
 					"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-					"dev": true,
 					"requires": {
 						"ansi-styles": "^2.2.1",
 						"escape-string-regexp": "^1.0.2",
@@ -12568,22 +11447,19 @@
 						"supports-color": {
 							"version": "2.0.0",
 							"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-							"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-							"dev": true
+							"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
 						}
 					}
 				},
 				"has-flag": {
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-					"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-					"dev": true
+					"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
 				},
 				"postcss": {
 					"version": "5.2.18",
 					"resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
 					"integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-					"dev": true,
 					"requires": {
 						"chalk": "^1.1.3",
 						"js-base64": "^2.1.9",
@@ -12594,14 +11470,12 @@
 				"source-map": {
 					"version": "0.5.7",
 					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-					"dev": true
+					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
 				},
 				"supports-color": {
 					"version": "3.2.3",
 					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
 					"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-					"dev": true,
 					"requires": {
 						"has-flag": "^1.0.0"
 					}
@@ -12612,7 +11486,6 @@
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-1.0.1.tgz",
 			"integrity": "sha1-aPgGlfBF0IJjqHmtJA343WT2ROo=",
-			"dev": true,
 			"requires": {
 				"postcss": "^5.0.4"
 			},
@@ -12620,14 +11493,12 @@
 				"ansi-styles": {
 					"version": "2.2.1",
 					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-					"dev": true
+					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
 				},
 				"chalk": {
 					"version": "1.1.3",
 					"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
 					"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-					"dev": true,
 					"requires": {
 						"ansi-styles": "^2.2.1",
 						"escape-string-regexp": "^1.0.2",
@@ -12639,22 +11510,19 @@
 						"supports-color": {
 							"version": "2.0.0",
 							"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-							"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-							"dev": true
+							"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
 						}
 					}
 				},
 				"has-flag": {
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-					"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-					"dev": true
+					"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
 				},
 				"postcss": {
 					"version": "5.2.18",
 					"resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
 					"integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-					"dev": true,
 					"requires": {
 						"chalk": "^1.1.3",
 						"js-base64": "^2.1.9",
@@ -12665,14 +11533,12 @@
 				"source-map": {
 					"version": "0.5.7",
 					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-					"dev": true
+					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
 				},
 				"supports-color": {
 					"version": "3.2.3",
 					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
 					"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-					"dev": true,
 					"requires": {
 						"has-flag": "^1.0.0"
 					}
@@ -12683,7 +11549,6 @@
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-1.0.4.tgz",
 			"integrity": "sha1-/3b02CEkN7McKYpC0uFEQCV3GuE=",
-			"dev": true,
 			"requires": {
 				"has": "^1.0.1",
 				"postcss": "^5.0.8",
@@ -12693,14 +11558,12 @@
 				"ansi-styles": {
 					"version": "2.2.1",
 					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-					"dev": true
+					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
 				},
 				"chalk": {
 					"version": "1.1.3",
 					"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
 					"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-					"dev": true,
 					"requires": {
 						"ansi-styles": "^2.2.1",
 						"escape-string-regexp": "^1.0.2",
@@ -12712,22 +11575,19 @@
 						"supports-color": {
 							"version": "2.0.0",
 							"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-							"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-							"dev": true
+							"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
 						}
 					}
 				},
 				"has-flag": {
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-					"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-					"dev": true
+					"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
 				},
 				"postcss": {
 					"version": "5.2.18",
 					"resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
 					"integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-					"dev": true,
 					"requires": {
 						"chalk": "^1.1.3",
 						"js-base64": "^2.1.9",
@@ -12738,14 +11598,12 @@
 				"source-map": {
 					"version": "0.5.7",
 					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-					"dev": true
+					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
 				},
 				"supports-color": {
 					"version": "3.2.3",
 					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
 					"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-					"dev": true,
 					"requires": {
 						"has-flag": "^1.0.0"
 					}
@@ -12756,7 +11614,6 @@
 			"version": "2.2.3",
 			"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz",
 			"integrity": "sha1-+UN3iGBsPJrO4W/+jYsWKX8nu5A=",
-			"dev": true,
 			"requires": {
 				"flatten": "^1.0.2",
 				"indexes-of": "^1.0.1",
@@ -12767,7 +11624,6 @@
 			"version": "2.1.6",
 			"resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-2.1.6.tgz",
 			"integrity": "sha1-tt8YqmE7Zm4TPwittSGcJoSsEI0=",
-			"dev": true,
 			"requires": {
 				"is-svg": "^2.0.0",
 				"postcss": "^5.0.14",
@@ -12778,14 +11634,12 @@
 				"ansi-styles": {
 					"version": "2.2.1",
 					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-					"dev": true
+					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
 				},
 				"chalk": {
 					"version": "1.1.3",
 					"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
 					"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-					"dev": true,
 					"requires": {
 						"ansi-styles": "^2.2.1",
 						"escape-string-regexp": "^1.0.2",
@@ -12797,22 +11651,19 @@
 						"supports-color": {
 							"version": "2.0.0",
 							"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-							"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-							"dev": true
+							"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
 						}
 					}
 				},
 				"has-flag": {
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-					"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-					"dev": true
+					"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
 				},
 				"postcss": {
 					"version": "5.2.18",
 					"resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
 					"integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-					"dev": true,
 					"requires": {
 						"chalk": "^1.1.3",
 						"js-base64": "^2.1.9",
@@ -12823,14 +11674,12 @@
 				"source-map": {
 					"version": "0.5.7",
 					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-					"dev": true
+					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
 				},
 				"supports-color": {
 					"version": "3.2.3",
 					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
 					"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-					"dev": true,
 					"requires": {
 						"has-flag": "^1.0.0"
 					}
@@ -12841,7 +11690,6 @@
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-2.0.2.tgz",
 			"integrity": "sha1-mB1X0p3csz57Hf4f1DuGSfkzyh0=",
-			"dev": true,
 			"requires": {
 				"alphanum-sort": "^1.0.1",
 				"postcss": "^5.0.4",
@@ -12851,14 +11699,12 @@
 				"ansi-styles": {
 					"version": "2.2.1",
 					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-					"dev": true
+					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
 				},
 				"chalk": {
 					"version": "1.1.3",
 					"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
 					"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-					"dev": true,
 					"requires": {
 						"ansi-styles": "^2.2.1",
 						"escape-string-regexp": "^1.0.2",
@@ -12870,22 +11716,19 @@
 						"supports-color": {
 							"version": "2.0.0",
 							"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-							"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-							"dev": true
+							"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
 						}
 					}
 				},
 				"has-flag": {
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-					"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-					"dev": true
+					"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
 				},
 				"postcss": {
 					"version": "5.2.18",
 					"resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
 					"integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-					"dev": true,
 					"requires": {
 						"chalk": "^1.1.3",
 						"js-base64": "^2.1.9",
@@ -12896,14 +11739,12 @@
 				"source-map": {
 					"version": "0.5.7",
 					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-					"dev": true
+					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
 				},
 				"supports-color": {
 					"version": "3.2.3",
 					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
 					"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-					"dev": true,
 					"requires": {
 						"has-flag": "^1.0.0"
 					}
@@ -12913,14 +11754,12 @@
 		"postcss-value-parser": {
 			"version": "3.3.0",
 			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz",
-			"integrity": "sha1-h/OPnxj3dKSrTIojL1xc6IcqnRU=",
-			"dev": true
+			"integrity": "sha1-h/OPnxj3dKSrTIojL1xc6IcqnRU="
 		},
 		"postcss-zindex": {
 			"version": "2.2.0",
 			"resolved": "https://registry.npmjs.org/postcss-zindex/-/postcss-zindex-2.2.0.tgz",
 			"integrity": "sha1-0hCd3AVbka9n/EyzsCWUZjnSryI=",
-			"dev": true,
 			"requires": {
 				"has": "^1.0.1",
 				"postcss": "^5.0.4",
@@ -12930,14 +11769,12 @@
 				"ansi-styles": {
 					"version": "2.2.1",
 					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-					"dev": true
+					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
 				},
 				"chalk": {
 					"version": "1.1.3",
 					"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
 					"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-					"dev": true,
 					"requires": {
 						"ansi-styles": "^2.2.1",
 						"escape-string-regexp": "^1.0.2",
@@ -12949,22 +11786,19 @@
 						"supports-color": {
 							"version": "2.0.0",
 							"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-							"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-							"dev": true
+							"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
 						}
 					}
 				},
 				"has-flag": {
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-					"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-					"dev": true
+					"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
 				},
 				"postcss": {
 					"version": "5.2.18",
 					"resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
 					"integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-					"dev": true,
 					"requires": {
 						"chalk": "^1.1.3",
 						"js-base64": "^2.1.9",
@@ -12975,14 +11809,12 @@
 				"source-map": {
 					"version": "0.5.7",
 					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-					"dev": true
+					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
 				},
 				"supports-color": {
 					"version": "3.2.3",
 					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
 					"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-					"dev": true,
 					"requires": {
 						"has-flag": "^1.0.0"
 					}
@@ -12992,8 +11824,7 @@
 		"prelude-ls": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-			"integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
-			"dev": true
+			"integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ="
 		},
 		"prepend-http": {
 			"version": "1.0.4",
@@ -13003,26 +11834,22 @@
 		"preserve": {
 			"version": "0.2.0",
 			"resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
-			"integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=",
-			"dev": true
+			"integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks="
 		},
 		"prettier": {
 			"version": "1.12.1",
 			"resolved": "https://registry.npmjs.org/prettier/-/prettier-1.12.1.tgz",
-			"integrity": "sha1-wa0g6APndJ+vkFpAnSNn4Gu+cyU=",
-			"dev": true
+			"integrity": "sha1-wa0g6APndJ+vkFpAnSNn4Gu+cyU="
 		},
 		"pretty-bytes": {
 			"version": "4.0.2",
 			"resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-4.0.2.tgz",
-			"integrity": "sha1-sr+C5zUNZcbDOqlaqlpPYyf2HNk=",
-			"dev": true
+			"integrity": "sha1-sr+C5zUNZcbDOqlaqlpPYyf2HNk="
 		},
 		"pretty-format": {
 			"version": "22.4.3",
 			"resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-22.4.3.tgz",
 			"integrity": "sha512-S4oT9/sT6MN7/3COoOy+ZJeA92VmOnveLHgrwBE3Z1W5N9S2A1QGNYiE1z75DAENbJrXXUb+OWXhpJcg05QKQQ==",
-			"dev": true,
 			"requires": {
 				"ansi-regex": "^3.0.0",
 				"ansi-styles": "^3.2.0"
@@ -13031,22 +11858,19 @@
 				"ansi-regex": {
 					"version": "3.0.0",
 					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-					"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-					"dev": true
+					"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
 				}
 			}
 		},
 		"private": {
 			"version": "0.1.8",
 			"resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
-			"integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==",
-			"dev": true
+			"integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg=="
 		},
 		"process": {
 			"version": "0.11.10",
 			"resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
-			"integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
-			"dev": true
+			"integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI="
 		},
 		"process-nextick-args": {
 			"version": "2.0.0",
@@ -13056,8 +11880,7 @@
 		"progress": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/progress/-/progress-2.0.0.tgz",
-			"integrity": "sha1-ihvjZr+Pwj2yvSPxDG/pILQ4nR8=",
-			"dev": true
+			"integrity": "sha1-ihvjZr+Pwj2yvSPxDG/pILQ4nR8="
 		},
 		"promise": {
 			"version": "7.3.1",
@@ -13070,8 +11893,7 @@
 		"promise-inflight": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
-			"integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=",
-			"dev": true
+			"integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM="
 		},
 		"prop-types": {
 			"version": "15.5.10",
@@ -13090,14 +11912,12 @@
 		"proxy-from-env": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.0.0.tgz",
-			"integrity": "sha1-M8UDmPcOp+uW0h97gXYwpVeRx+4=",
-			"dev": true
+			"integrity": "sha1-M8UDmPcOp+uW0h97gXYwpVeRx+4="
 		},
 		"prr": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
-			"integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=",
-			"dev": true
+			"integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY="
 		},
 		"pseudomap": {
 			"version": "1.0.2",
@@ -13108,7 +11928,6 @@
 			"version": "4.0.2",
 			"resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.2.tgz",
 			"integrity": "sha512-4kJ5Esocg8X3h8YgJsKAuoesBgB7mqH3eowiDzMUPKiRDDE7E/BqqZD1hnTByIaAFiwAw246YEltSq7tdrOH0Q==",
-			"dev": true,
 			"requires": {
 				"bn.js": "^4.1.0",
 				"browserify-rsa": "^4.0.0",
@@ -13121,7 +11940,6 @@
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
 			"integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
-			"dev": true,
 			"requires": {
 				"end-of-stream": "^1.1.0",
 				"once": "^1.3.1"
@@ -13131,7 +11949,6 @@
 			"version": "1.5.1",
 			"resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
 			"integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
-			"dev": true,
 			"requires": {
 				"duplexify": "^3.6.0",
 				"inherits": "^2.0.3",
@@ -13141,14 +11958,12 @@
 		"punycode": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.0.tgz",
-			"integrity": "sha1-X4Y+3Im5bbCQdLrXlHvwkFbKTn0=",
-			"dev": true
+			"integrity": "sha1-X4Y+3Im5bbCQdLrXlHvwkFbKTn0="
 		},
 		"puppeteer": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-1.2.0.tgz",
 			"integrity": "sha512-4sY/6mB7+kNPGAzPGKq65tH0VG3ohUEkXHuOReB9K/tw3m1TqifYmxnMR/uDeci/UPwyk5K1gWYh8rw0U0Zscw==",
-			"dev": true,
 			"requires": {
 				"debug": "^2.6.8",
 				"extract-zip": "^1.6.5",
@@ -13164,7 +11979,6 @@
 					"version": "3.3.3",
 					"resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz",
 					"integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==",
-					"dev": true,
 					"requires": {
 						"async-limiter": "~1.0.0",
 						"safe-buffer": "~5.1.0",
@@ -13181,14 +11995,12 @@
 		"qs": {
 			"version": "6.5.2",
 			"resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-			"integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
-			"dev": true
+			"integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
 		},
 		"query-string": {
 			"version": "5.1.1",
 			"resolved": "https://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz",
 			"integrity": "sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==",
-			"dev": true,
 			"requires": {
 				"decode-uri-component": "^0.2.0",
 				"object-assign": "^4.1.0",
@@ -13198,14 +12010,12 @@
 		"querystring": {
 			"version": "0.2.0",
 			"resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
-			"integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
-			"dev": true
+			"integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA="
 		},
 		"querystring-es3": {
 			"version": "0.2.1",
 			"resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
-			"integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
-			"dev": true
+			"integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM="
 		},
 		"querystringify": {
 			"version": "1.0.0",
@@ -13221,7 +12031,6 @@
 			"version": "3.4.0",
 			"resolved": "https://registry.npmjs.org/raf/-/raf-3.4.0.tgz",
 			"integrity": "sha512-pDP/NMRAXoTfrhCfyfSEwJAKLaxBU9eApMeBPB1TkDouZmvPerIClV8lTAd+uF8ZiTaVl69e1FCxQrAd/VTjGw==",
-			"dev": true,
 			"requires": {
 				"performance-now": "^2.1.0"
 			}
@@ -13229,14 +12038,12 @@
 		"railroad-diagrams": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz",
-			"integrity": "sha1-635iZ1SN3t+4mcG5Dlc3RVnN234=",
-			"dev": true
+			"integrity": "sha1-635iZ1SN3t+4mcG5Dlc3RVnN234="
 		},
 		"randexp": {
 			"version": "0.4.6",
 			"resolved": "https://registry.npmjs.org/randexp/-/randexp-0.4.6.tgz",
 			"integrity": "sha512-80WNmd9DA0tmZrw9qQa62GPPWfuXJknrmVmLcxvq4uZBdYqb1wYoKTmnlGUchvVWe0XiLupYkBoXVOxz3C8DYQ==",
-			"dev": true,
 			"requires": {
 				"discontinuous-range": "1.0.0",
 				"ret": "~0.1.10"
@@ -13246,7 +12053,6 @@
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.0.0.tgz",
 			"integrity": "sha512-VdxFOIEY3mNO5PtSRkkle/hPJDHvQhK21oa73K4yAc9qmp6N429gAyF1gZMOTMeS0/AYzaV/2Trcef+NaIonSA==",
-			"dev": true,
 			"requires": {
 				"is-number": "^4.0.0",
 				"kind-of": "^6.0.0",
@@ -13256,14 +12062,12 @@
 				"is-number": {
 					"version": "4.0.0",
 					"resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
-					"integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
-					"dev": true
+					"integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ=="
 				},
 				"kind-of": {
 					"version": "6.0.2",
 					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-					"dev": true
+					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
 				}
 			}
 		},
@@ -13271,7 +12075,6 @@
 			"version": "2.0.6",
 			"resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz",
 			"integrity": "sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==",
-			"dev": true,
 			"requires": {
 				"safe-buffer": "^5.1.0"
 			}
@@ -13280,7 +12083,6 @@
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
 			"integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
-			"dev": true,
 			"requires": {
 				"randombytes": "^2.0.5",
 				"safe-buffer": "^5.1.0"
@@ -13290,7 +12092,6 @@
 			"version": "1.1.7",
 			"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-1.1.7.tgz",
 			"integrity": "sha1-HQJ8K/oRasxmI7yo8AAWVyqH1CU=",
-			"dev": true,
 			"requires": {
 				"bytes": "1",
 				"string_decoder": "0.10"
@@ -13299,16 +12100,14 @@
 				"string_decoder": {
 					"version": "0.10.31",
 					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-					"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-					"dev": true
+					"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
 				}
 			}
 		},
 		"raw-loader": {
 			"version": "0.5.1",
 			"resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-0.5.1.tgz",
-			"integrity": "sha1-DD0L6u2KAclm2Xh793goElKpeao=",
-			"dev": true
+			"integrity": "sha1-DD0L6u2KAclm2Xh793goElKpeao="
 		},
 		"rc": {
 			"version": "1.2.7",
@@ -13334,9 +12133,9 @@
 			"integrity": "sha512-5Nm4FL5wz41/5SYz8yJIM1kCcftxNPXxv3Yfa5qhkrGasHPgYzmzbbu1pcYM9vuCHog79EVwKWuz7zxDH52Gfw=="
 		},
 		"react": {
-			"version": "16.3.2",
-			"resolved": "https://registry.npmjs.org/react/-/react-16.3.2.tgz",
-			"integrity": "sha512-o5GPdkhciQ3cEph6qgvYB7LTOHw/GB0qRI6ZFNugj49qJCFfgHwVNjZ5u+b7nif4vOeMIOuYj3CeYe2IBD74lg==",
+			"version": "16.4.1",
+			"resolved": "https://registry.npmjs.org/react/-/react-16.4.1.tgz",
+			"integrity": "sha512-3GEs0giKp6E0Oh/Y9ZC60CmYgUPnp7voH9fbjWsvXtYFb4EWtgQub0ADSq0sJR0BbHc4FThLLtzlcFaFXIorwg==",
 			"requires": {
 				"fbjs": "^0.8.16",
 				"loose-envify": "^1.1.0",
@@ -13345,11 +12144,10 @@
 			},
 			"dependencies": {
 				"prop-types": {
-					"version": "15.6.1",
-					"resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.1.tgz",
-					"integrity": "sha512-4ec7bY1Y66LymSUOH/zARVYObB23AT2h8cf6e/O6ZALB/N0sqZFEx7rq6EYPX2MkOdKORuooI/H5k9TlR4q7kQ==",
+					"version": "15.6.2",
+					"resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.2.tgz",
+					"integrity": "sha512-3pboPvLiWD7dkI3qf3KbUe6hKFKa52w+AE0VCqECtf+QHAKgOL37tTaNCnuX1nAAQ4ZhyP+kYVKf8rLmJ/feDQ==",
 					"requires": {
-						"fbjs": "^0.8.16",
 						"loose-envify": "^1.3.1",
 						"object-assign": "^4.1.1"
 					}
@@ -13410,9 +12208,9 @@
 			}
 		},
 		"react-dom": {
-			"version": "16.3.2",
-			"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.3.2.tgz",
-			"integrity": "sha512-MMPko3zYncNrz/7gG17wJWUREZDvskZHXOwbttzl0F0L3wDmToyuETuo/r8Y5yvDejwYcRyWI1lvVBjLJWFwKA==",
+			"version": "16.4.1",
+			"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.4.1.tgz",
+			"integrity": "sha512-1Gin+wghF/7gl4Cqcvr1DxFX2Osz7ugxSwl6gBqCMpdrxHjIFUS7GYxrFftZ9Ln44FHw0JxCFD9YtZsrbR5/4A==",
 			"requires": {
 				"fbjs": "^0.8.16",
 				"loose-envify": "^1.1.0",
@@ -13421,11 +12219,10 @@
 			},
 			"dependencies": {
 				"prop-types": {
-					"version": "15.6.1",
-					"resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.1.tgz",
-					"integrity": "sha512-4ec7bY1Y66LymSUOH/zARVYObB23AT2h8cf6e/O6ZALB/N0sqZFEx7rq6EYPX2MkOdKORuooI/H5k9TlR4q7kQ==",
+					"version": "15.6.2",
+					"resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.2.tgz",
+					"integrity": "sha512-3pboPvLiWD7dkI3qf3KbUe6hKFKa52w+AE0VCqECtf+QHAKgOL37tTaNCnuX1nAAQ4ZhyP+kYVKf8rLmJ/feDQ==",
 					"requires": {
-						"fbjs": "^0.8.16",
 						"loose-envify": "^1.3.1",
 						"object-assign": "^4.1.1"
 					}
@@ -13433,10 +12230,9 @@
 			}
 		},
 		"react-is": {
-			"version": "16.3.2",
-			"resolved": "https://registry.npmjs.org/react-is/-/react-is-16.3.2.tgz",
-			"integrity": "sha512-ybEM7YOr4yBgFd6w8dJqwxegqZGJNBZl6U27HnGKuTZmDvVrD5quWOK/wAnMywiZzW+Qsk+l4X2c70+thp/A8Q==",
-			"dev": true
+			"version": "16.4.1",
+			"resolved": "https://registry.npmjs.org/react-is/-/react-is-16.4.1.tgz",
+			"integrity": "sha512-xpb0PpALlFWNw/q13A+1aHeyJyLYCg0/cCHPUA43zYluZuIPHaHL3k8OBsTgQtxqW0FhyDEMvi8fZ/+7+r4OSQ=="
 		},
 		"react-onclickoutside": {
 			"version": "6.7.1",
@@ -13468,7 +12264,6 @@
 			"version": "0.7.0",
 			"resolved": "https://registry.npmjs.org/react-reconciler/-/react-reconciler-0.7.0.tgz",
 			"integrity": "sha512-50JwZ3yNyMS8fchN+jjWEJOH3Oze7UmhxeoJLn2j6f3NjpfCRbcmih83XTWmzqtar/ivd5f7tvQhvvhism2fgg==",
-			"dev": true,
 			"requires": {
 				"fbjs": "^0.8.16",
 				"loose-envify": "^1.1.0",
@@ -13480,7 +12275,6 @@
 					"version": "15.6.1",
 					"resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.1.tgz",
 					"integrity": "sha512-4ec7bY1Y66LymSUOH/zARVYObB23AT2h8cf6e/O6ZALB/N0sqZFEx7rq6EYPX2MkOdKORuooI/H5k9TlR4q7kQ==",
-					"dev": true,
 					"requires": {
 						"fbjs": "^0.8.16",
 						"loose-envify": "^1.3.1",
@@ -13490,24 +12284,21 @@
 			}
 		},
 		"react-test-renderer": {
-			"version": "16.3.2",
-			"resolved": "https://registry.npmjs.org/react-test-renderer/-/react-test-renderer-16.3.2.tgz",
-			"integrity": "sha512-lL8WHIpCTMdSe+CRkt0rfMxBkJFyhVrpdQ54BaJRIrXf9aVmbeHbRA8GFRpTvohPN5tPzMabmrzW2PUfWCfWwQ==",
-			"dev": true,
+			"version": "16.4.1",
+			"resolved": "https://registry.npmjs.org/react-test-renderer/-/react-test-renderer-16.4.1.tgz",
+			"integrity": "sha512-wyyiPxRZOTpKnNIgUBOB6xPLTpIzwcQMIURhZvzUqZzezvHjaGNsDPBhMac5fIY3Jf5NuKxoGvV64zDSOECPPQ==",
 			"requires": {
 				"fbjs": "^0.8.16",
 				"object-assign": "^4.1.1",
 				"prop-types": "^15.6.0",
-				"react-is": "^16.3.2"
+				"react-is": "^16.4.1"
 			},
 			"dependencies": {
 				"prop-types": {
-					"version": "15.6.1",
-					"resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.1.tgz",
-					"integrity": "sha512-4ec7bY1Y66LymSUOH/zARVYObB23AT2h8cf6e/O6ZALB/N0sqZFEx7rq6EYPX2MkOdKORuooI/H5k9TlR4q7kQ==",
-					"dev": true,
+					"version": "15.6.2",
+					"resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.2.tgz",
+					"integrity": "sha512-3pboPvLiWD7dkI3qf3KbUe6hKFKa52w+AE0VCqECtf+QHAKgOL37tTaNCnuX1nAAQ4ZhyP+kYVKf8rLmJ/feDQ==",
 					"requires": {
-						"fbjs": "^0.8.16",
 						"loose-envify": "^1.3.1",
 						"object-assign": "^4.1.1"
 					}
@@ -13526,7 +12317,6 @@
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/read-chunk/-/read-chunk-2.1.0.tgz",
 			"integrity": "sha1-agTAkoAF7Z1C4aasVgDhnLx/9lU=",
-			"dev": true,
 			"requires": {
 				"pify": "^3.0.0",
 				"safe-buffer": "^5.1.1"
@@ -13649,7 +12439,6 @@
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz",
 			"integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=",
-			"dev": true,
 			"requires": {
 				"graceful-fs": "^4.1.2",
 				"minimatch": "^3.0.2",
@@ -13661,7 +12450,6 @@
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/realpath-native/-/realpath-native-1.0.0.tgz",
 			"integrity": "sha512-XJtlRJ9jf0E1H1SLeJyQ9PGzQD7S65h1pRXEcAeK48doKOnKxcgPeNohJvD5u/2sI9J1oke6E8bZHS/fmW1UiQ==",
-			"dev": true,
 			"requires": {
 				"util.promisify": "^1.0.0"
 			}
@@ -13670,7 +12458,6 @@
 			"version": "0.14.7",
 			"resolved": "https://registry.npmjs.org/recast/-/recast-0.14.7.tgz",
 			"integrity": "sha512-/nwm9pkrcWagN40JeJhkPaRxiHXBRkXyRh/hgU088Z/v+qCy+zIHHY6bC6o7NaKAxPqtE6nD8zBH1LfU0/Wx6A==",
-			"dev": true,
 			"requires": {
 				"ast-types": "0.11.3",
 				"esprima": "~4.0.0",
@@ -13681,8 +12468,7 @@
 				"source-map": {
 					"version": "0.6.1",
 					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-					"dev": true
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
 				}
 			}
 		},
@@ -13690,7 +12476,6 @@
 			"version": "0.6.2",
 			"resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
 			"integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
-			"dev": true,
 			"requires": {
 				"resolve": "^1.1.6"
 			}
@@ -13708,7 +12493,6 @@
 			"version": "1.3.0",
 			"resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz",
 			"integrity": "sha1-dHyRTgSWFKTJz7umKYca0dKSdxY=",
-			"dev": true,
 			"requires": {
 				"balanced-match": "^0.4.2",
 				"math-expression-evaluator": "^1.2.14",
@@ -13718,8 +12502,7 @@
 				"balanced-match": {
 					"version": "0.4.2",
 					"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
-					"integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=",
-					"dev": true
+					"integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg="
 				}
 			}
 		},
@@ -13727,7 +12510,6 @@
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/reduce-function-call/-/reduce-function-call-1.0.2.tgz",
 			"integrity": "sha1-WiAL+S4ON3UXUv5FsKszD9S2vpk=",
-			"dev": true,
 			"requires": {
 				"balanced-match": "^0.4.2"
 			},
@@ -13735,8 +12517,7 @@
 				"balanced-match": {
 					"version": "0.4.2",
 					"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
-					"integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=",
-					"dev": true
+					"integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg="
 				}
 			}
 		},
@@ -13769,20 +12550,17 @@
 		"regenerate": {
 			"version": "1.4.0",
 			"resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz",
-			"integrity": "sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==",
-			"dev": true
+			"integrity": "sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg=="
 		},
 		"regenerator-runtime": {
 			"version": "0.11.1",
 			"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
-			"integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
-			"dev": true
+			"integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
 		},
 		"regenerator-transform": {
 			"version": "0.10.1",
 			"resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.10.1.tgz",
 			"integrity": "sha512-PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q==",
-			"dev": true,
 			"requires": {
 				"babel-runtime": "^6.18.0",
 				"babel-types": "^6.19.0",
@@ -13793,7 +12571,6 @@
 			"version": "0.4.4",
 			"resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
 			"integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
-			"dev": true,
 			"requires": {
 				"is-equal-shallow": "^0.1.3"
 			}
@@ -13802,7 +12579,6 @@
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
 			"integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
-			"dev": true,
 			"requires": {
 				"extend-shallow": "^3.0.2",
 				"safe-regex": "^1.1.0"
@@ -13812,7 +12588,6 @@
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz",
 			"integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=",
-			"dev": true,
 			"requires": {
 				"regenerate": "^1.2.1",
 				"regjsgen": "^0.2.0",
@@ -13839,14 +12614,12 @@
 		"regjsgen": {
 			"version": "0.2.0",
 			"resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
-			"integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=",
-			"dev": true
+			"integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc="
 		},
 		"regjsparser": {
 			"version": "0.1.5",
 			"resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz",
 			"integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=",
-			"dev": true,
 			"requires": {
 				"jsesc": "~0.5.0"
 			}
@@ -13859,14 +12632,12 @@
 		"remove-trailing-separator": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
-			"integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
-			"dev": true
+			"integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8="
 		},
 		"repeat-element": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz",
-			"integrity": "sha1-7wiaF40Ug7quTZPrmLT55OEdmQo=",
-			"dev": true
+			"integrity": "sha1-7wiaF40Ug7quTZPrmLT55OEdmQo="
 		},
 		"repeat-string": {
 			"version": "1.6.1",
@@ -13884,14 +12655,12 @@
 		"replace-ext": {
 			"version": "0.0.1",
 			"resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
-			"integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=",
-			"dev": true
+			"integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ="
 		},
 		"request": {
 			"version": "2.86.0",
 			"resolved": "https://registry.npmjs.org/request/-/request-2.86.0.tgz",
 			"integrity": "sha512-BQZih67o9r+Ys94tcIW4S7Uu8pthjrQVxhsZ/weOwHbDfACxvIyvnAbzFQxjy1jMtvFSzv5zf4my6cZsJBbVzw==",
-			"dev": true,
 			"requires": {
 				"aws-sign2": "~0.7.0",
 				"aws4": "^1.6.0",
@@ -13920,7 +12689,6 @@
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.1.tgz",
 			"integrity": "sha1-Pu4AssWqgyOc+wTFcA2jb4HNCLY=",
-			"dev": true,
 			"requires": {
 				"lodash": "^4.13.1"
 			}
@@ -13929,7 +12697,6 @@
 			"version": "1.0.5",
 			"resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.5.tgz",
 			"integrity": "sha1-UoF3D2jgyXGeUWP9P6tIIhX0/aU=",
-			"dev": true,
 			"requires": {
 				"request-promise-core": "1.1.1",
 				"stealthy-require": "^1.1.0",
@@ -13944,8 +12711,7 @@
 		"require-from-string": {
 			"version": "1.2.1",
 			"resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-1.2.1.tgz",
-			"integrity": "sha1-UpyczvJzgK3+yaL5ZbZJu+5jZBg=",
-			"dev": true
+			"integrity": "sha1-UpyczvJzgK3+yaL5ZbZJu+5jZBg="
 		},
 		"require-main-filename": {
 			"version": "1.0.1",
@@ -13956,7 +12722,6 @@
 			"version": "1.0.3",
 			"resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz",
 			"integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=",
-			"dev": true,
 			"requires": {
 				"caller-path": "^0.1.0",
 				"resolve-from": "^1.0.0"
@@ -13965,8 +12730,7 @@
 				"resolve-from": {
 					"version": "1.0.1",
 					"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz",
-					"integrity": "sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=",
-					"dev": true
+					"integrity": "sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY="
 				}
 			}
 		},
@@ -13987,7 +12751,6 @@
 			"version": "0.4.0",
 			"resolved": "https://registry.npmjs.org/resolve-bin/-/resolve-bin-0.4.0.tgz",
 			"integrity": "sha1-RxMiSYkRAa+xmZH+k3ywpfBy5dk=",
-			"dev": true,
 			"requires": {
 				"find-parent-dir": "~0.3.0"
 			}
@@ -13996,7 +12759,6 @@
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz",
 			"integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=",
-			"dev": true,
 			"requires": {
 				"resolve-from": "^3.0.0"
 			}
@@ -14005,7 +12767,6 @@
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
 			"integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
-			"dev": true,
 			"requires": {
 				"expand-tilde": "^2.0.0",
 				"global-modules": "^1.0.0"
@@ -14014,20 +12775,17 @@
 		"resolve-from": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
-			"integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
-			"dev": true
+			"integrity": "sha1-six699nWiBvItuZTM17rywoYh0g="
 		},
 		"resolve-url": {
 			"version": "0.2.1",
 			"resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
-			"integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
-			"dev": true
+			"integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo="
 		},
 		"responselike": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz",
 			"integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=",
-			"dev": true,
 			"requires": {
 				"lowercase-keys": "^1.0.0"
 			}
@@ -14044,14 +12802,12 @@
 		"ret": {
 			"version": "0.1.15",
 			"resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
-			"integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
-			"dev": true
+			"integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="
 		},
 		"rgb": {
 			"version": "0.1.0",
 			"resolved": "https://registry.npmjs.org/rgb/-/rgb-0.1.0.tgz",
-			"integrity": "sha1-vieykej+/+rBvZlylyG/pA/AN7U=",
-			"dev": true
+			"integrity": "sha1-vieykej+/+rBvZlylyG/pA/AN7U="
 		},
 		"right-align": {
 			"version": "0.1.3",
@@ -14074,7 +12830,6 @@
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
 			"integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
-			"dev": true,
 			"requires": {
 				"hash-base": "^3.0.0",
 				"inherits": "^2.0.1"
@@ -14084,7 +12839,6 @@
 			"version": "2.2.3",
 			"resolved": "https://registry.npmjs.org/rst-selector-parser/-/rst-selector-parser-2.2.3.tgz",
 			"integrity": "sha1-gbIw6i/MYGbInjRy3nlChdmwPZE=",
-			"dev": true,
 			"requires": {
 				"lodash.flattendeep": "^4.4.0",
 				"nearley": "^2.7.10"
@@ -14093,14 +12847,12 @@
 		"rsvp": {
 			"version": "3.6.2",
 			"resolved": "https://registry.npmjs.org/rsvp/-/rsvp-3.6.2.tgz",
-			"integrity": "sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw==",
-			"dev": true
+			"integrity": "sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw=="
 		},
 		"rtlcss": {
 			"version": "2.2.1",
 			"resolved": "https://registry.npmjs.org/rtlcss/-/rtlcss-2.2.1.tgz",
 			"integrity": "sha512-JjQ5DlrmwiItAjlmhoxrJq5ihgZcE0wMFxt7S17bIrt4Lw0WwKKFk+viRhvodB/0falyG/5fiO043ZDh6/aqTw==",
-			"dev": true,
 			"requires": {
 				"chalk": "^2.3.0",
 				"findup": "^0.1.5",
@@ -14120,14 +12872,12 @@
 		"run-parallel": {
 			"version": "1.1.9",
 			"resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz",
-			"integrity": "sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==",
-			"dev": true
+			"integrity": "sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q=="
 		},
 		"run-queue": {
 			"version": "1.0.3",
 			"resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz",
 			"integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=",
-			"dev": true,
 			"requires": {
 				"aproba": "^1.1.1"
 			}
@@ -14135,8 +12885,7 @@
 		"rx": {
 			"version": "2.3.24",
 			"resolved": "https://registry.npmjs.org/rx/-/rx-2.3.24.tgz",
-			"integrity": "sha1-FPlQpCF9fjXapxu8vljv9o6ksrc=",
-			"dev": true
+			"integrity": "sha1-FPlQpCF9fjXapxu8vljv9o6ksrc="
 		},
 		"rx-lite": {
 			"version": "4.0.8",
@@ -14155,7 +12904,6 @@
 			"version": "5.5.10",
 			"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.10.tgz",
 			"integrity": "sha512-SRjimIDUHJkon+2hFo7xnvNC4ZEHGzCRwh9P7nzX3zPkCGFEg/tuElrNR7L/rZMagnK2JeH2jQwPRpmyXyLB6A==",
-			"dev": true,
 			"requires": {
 				"symbol-observable": "1.0.1"
 			},
@@ -14163,8 +12911,7 @@
 				"symbol-observable": {
 					"version": "1.0.1",
 					"resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.1.tgz",
-					"integrity": "sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ=",
-					"dev": true
+					"integrity": "sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ="
 				}
 			}
 		},
@@ -14176,14 +12923,12 @@
 		"safe-json-parse": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/safe-json-parse/-/safe-json-parse-1.0.1.tgz",
-			"integrity": "sha1-PnZyPjjf3aE8mx0poeB//uSzC1c=",
-			"dev": true
+			"integrity": "sha1-PnZyPjjf3aE8mx0poeB//uSzC1c="
 		},
 		"safe-regex": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
 			"integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
-			"dev": true,
 			"requires": {
 				"ret": "~0.1.10"
 			}
@@ -14197,7 +12942,6 @@
 			"version": "2.5.2",
 			"resolved": "https://registry.npmjs.org/sane/-/sane-2.5.2.tgz",
 			"integrity": "sha1-tNwYYcIbQn6SlQej51HiosuKs/o=",
-			"dev": true,
 			"requires": {
 				"anymatch": "^2.0.0",
 				"capture-exit": "^1.2.0",
@@ -14213,8 +12957,7 @@
 				"minimist": {
 					"version": "1.2.0",
 					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-					"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-					"dev": true
+					"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
 				}
 			}
 		},
@@ -14222,7 +12965,6 @@
 			"version": "2.2.4",
 			"resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.4.tgz",
 			"integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=",
-			"dev": true,
 			"requires": {
 				"glob": "^7.0.0",
 				"lodash": "^4.0.0",
@@ -14233,14 +12975,12 @@
 				"camelcase": {
 					"version": "3.0.0",
 					"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-					"integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
-					"dev": true
+					"integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo="
 				},
 				"cliui": {
 					"version": "3.2.0",
 					"resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
 					"integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
-					"dev": true,
 					"requires": {
 						"string-width": "^1.0.1",
 						"strip-ansi": "^3.0.1",
@@ -14251,7 +12991,6 @@
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
 					"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-					"dev": true,
 					"requires": {
 						"number-is-nan": "^1.0.0"
 					}
@@ -14260,7 +12999,6 @@
 					"version": "1.4.0",
 					"resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
 					"integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
-					"dev": true,
 					"requires": {
 						"lcid": "^1.0.0"
 					}
@@ -14269,7 +13007,6 @@
 					"version": "1.0.2",
 					"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
 					"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-					"dev": true,
 					"requires": {
 						"code-point-at": "^1.0.0",
 						"is-fullwidth-code-point": "^1.0.0",
@@ -14279,14 +13016,12 @@
 				"which-module": {
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
-					"integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
-					"dev": true
+					"integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8="
 				},
 				"yargs": {
 					"version": "7.1.0",
 					"resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz",
 					"integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=",
-					"dev": true,
 					"requires": {
 						"camelcase": "^3.0.0",
 						"cliui": "^3.2.0",
@@ -14307,7 +13042,6 @@
 					"version": "5.0.0",
 					"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz",
 					"integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=",
-					"dev": true,
 					"requires": {
 						"camelcase": "^3.0.0"
 					}
@@ -14318,7 +13052,6 @@
 			"version": "6.0.7",
 			"resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-6.0.7.tgz",
 			"integrity": "sha512-JoiyD00Yo1o61OJsoP2s2kb19L1/Y2p3QFcCdWdF6oomBGKVYuZyqHWemRBfQ2uGYsk+CH3eCguXNfpjzlcpaA==",
-			"dev": true,
 			"requires": {
 				"clone-deep": "^2.0.1",
 				"loader-utils": "^1.0.1",
@@ -14330,14 +13063,12 @@
 		"sax": {
 			"version": "1.2.4",
 			"resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-			"integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
-			"dev": true
+			"integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
 		},
 		"schema-utils": {
 			"version": "0.4.5",
 			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.5.tgz",
 			"integrity": "sha512-yYrjb9TX2k/J1Y5UNy3KYdZq10xhYcF8nMpAW6o3hy6Q8WSIEf9lJHG/ePnOBfziPM3fvQwfOwa13U/Fh8qTfA==",
-			"dev": true,
 			"requires": {
 				"ajv": "^6.1.0",
 				"ajv-keywords": "^3.1.0"
@@ -14347,7 +13078,6 @@
 					"version": "6.5.0",
 					"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.0.tgz",
 					"integrity": "sha512-VDUX1oSajablmiyFyED9L1DFndg0P9h7p1F+NO8FkIzei6EPrR6Zu1n18rd5P8PqaSRd/FrWv3G1TVBqpM83gA==",
-					"dev": true,
 					"requires": {
 						"fast-deep-equal": "^2.0.1",
 						"fast-json-stable-stringify": "^2.0.0",
@@ -14358,22 +13088,19 @@
 				"fast-deep-equal": {
 					"version": "2.0.1",
 					"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-					"integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
-					"dev": true
+					"integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
 				}
 			}
 		},
 		"scoped-regex": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/scoped-regex/-/scoped-regex-1.0.0.tgz",
-			"integrity": "sha1-o0a7Gs1CB65wvXwMfKnlZra63bg=",
-			"dev": true
+			"integrity": "sha1-o0a7Gs1CB65wvXwMfKnlZra63bg="
 		},
 		"scss-tokenizer": {
 			"version": "0.2.3",
 			"resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz",
 			"integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=",
-			"dev": true,
 			"requires": {
 				"js-base64": "^2.1.8",
 				"source-map": "^0.4.2"
@@ -14392,8 +13119,7 @@
 		"serialize-javascript": {
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.5.0.tgz",
-			"integrity": "sha512-Ga8c8NjAAp46Br4+0oZ2WxJCwIzwP60Gq1YPgU+39PiTVxyed/iKE/zyZI6+UlVYH5Q4PaQdHhcegIFPZTUfoQ==",
-			"dev": true
+			"integrity": "sha512-Ga8c8NjAAp46Br4+0oZ2WxJCwIzwP60Gq1YPgU+39PiTVxyed/iKE/zyZI6+UlVYH5Q4PaQdHhcegIFPZTUfoQ=="
 		},
 		"set-blocking": {
 			"version": "2.0.0",
@@ -14403,14 +13129,12 @@
 		"set-immediate-shim": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz",
-			"integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=",
-			"dev": true
+			"integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E="
 		},
 		"set-value": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz",
 			"integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==",
-			"dev": true,
 			"requires": {
 				"extend-shallow": "^2.0.1",
 				"is-extendable": "^0.1.1",
@@ -14422,7 +13146,6 @@
 					"version": "2.0.1",
 					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
 					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-					"dev": true,
 					"requires": {
 						"is-extendable": "^0.1.0"
 					}
@@ -14438,7 +13161,6 @@
 			"version": "2.4.11",
 			"resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
 			"integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
-			"dev": true,
 			"requires": {
 				"inherits": "^2.0.1",
 				"safe-buffer": "^5.0.1"
@@ -14448,7 +13170,6 @@
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-1.0.0.tgz",
 			"integrity": "sha512-oeXreoKR/SyNJtRJMAKPDSvd28OqEwG4eR/xc856cRGBII7gX9lvAqDxusPm0846z/w/hWYjI1NpKwJ00NHzRA==",
-			"dev": true,
 			"requires": {
 				"is-extendable": "^0.1.1",
 				"kind-of": "^5.0.0",
@@ -14458,8 +13179,7 @@
 				"kind-of": {
 					"version": "5.1.0",
 					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-					"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-					"dev": true
+					"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="
 				}
 			}
 		},
@@ -14480,7 +13200,6 @@
 			"version": "0.8.2",
 			"resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.2.tgz",
 			"integrity": "sha512-pRXeNrCA2Wd9itwhvLp5LZQvPJ0wU6bcjaTMywHHGX5XWhVN2nzSu7WV0q+oUY7mGK3mgSkDDzP3MgjqdyIgbQ==",
-			"dev": true,
 			"requires": {
 				"glob": "^7.0.0",
 				"interpret": "^1.0.0",
@@ -14490,8 +13209,7 @@
 		"shellwords": {
 			"version": "0.1.1",
 			"resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz",
-			"integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==",
-			"dev": true
+			"integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww=="
 		},
 		"showdown": {
 			"version": "1.8.6",
@@ -14582,7 +13300,6 @@
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz",
 			"integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==",
-			"dev": true,
 			"requires": {
 				"is-fullwidth-code-point": "^2.0.0"
 			}
@@ -14590,14 +13307,12 @@
 		"slide": {
 			"version": "1.1.6",
 			"resolved": "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz",
-			"integrity": "sha1-VusCfWW00tzmyy4tMsTUr8nh1wc=",
-			"dev": true
+			"integrity": "sha1-VusCfWW00tzmyy4tMsTUr8nh1wc="
 		},
 		"snapdragon": {
 			"version": "0.8.2",
 			"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
 			"integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
-			"dev": true,
 			"requires": {
 				"base": "^0.11.1",
 				"debug": "^2.2.0",
@@ -14613,7 +13328,6 @@
 					"version": "0.2.5",
 					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
 					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-					"dev": true,
 					"requires": {
 						"is-descriptor": "^0.1.0"
 					}
@@ -14622,7 +13336,6 @@
 					"version": "2.0.1",
 					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
 					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-					"dev": true,
 					"requires": {
 						"is-extendable": "^0.1.0"
 					}
@@ -14630,8 +13343,7 @@
 				"source-map": {
 					"version": "0.5.7",
 					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-					"dev": true
+					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
 				}
 			}
 		},
@@ -14639,7 +13351,6 @@
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
 			"integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
-			"dev": true,
 			"requires": {
 				"define-property": "^1.0.0",
 				"isobject": "^3.0.0",
@@ -14650,7 +13361,6 @@
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
 					"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-					"dev": true,
 					"requires": {
 						"is-descriptor": "^1.0.0"
 					}
@@ -14659,7 +13369,6 @@
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
 					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-					"dev": true,
 					"requires": {
 						"kind-of": "^6.0.0"
 					}
@@ -14668,7 +13377,6 @@
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
 					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-					"dev": true,
 					"requires": {
 						"kind-of": "^6.0.0"
 					}
@@ -14677,7 +13385,6 @@
 					"version": "1.0.2",
 					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
 					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-					"dev": true,
 					"requires": {
 						"is-accessor-descriptor": "^1.0.0",
 						"is-data-descriptor": "^1.0.0",
@@ -14687,8 +13394,7 @@
 				"kind-of": {
 					"version": "6.0.2",
 					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-					"dev": true
+					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
 				}
 			}
 		},
@@ -14696,7 +13402,6 @@
 			"version": "3.0.1",
 			"resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
 			"integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
-			"dev": true,
 			"requires": {
 				"kind-of": "^3.2.0"
 			}
@@ -14705,7 +13410,6 @@
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz",
 			"integrity": "sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==",
-			"dev": true,
 			"requires": {
 				"hoek": "4.x.x"
 			}
@@ -14721,8 +13425,7 @@
 		"source-list-map": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz",
-			"integrity": "sha512-I2UmuJSRr/T8jisiROLU3A3ltr+swpniSmNPI4Ml3ZCX6tVnDsuZzK7F2hl5jTqbZBWCEKlj5HRQiPExXLgE8A==",
-			"dev": true
+			"integrity": "sha512-I2UmuJSRr/T8jisiROLU3A3ltr+swpniSmNPI4Ml3ZCX6tVnDsuZzK7F2hl5jTqbZBWCEKlj5HRQiPExXLgE8A=="
 		},
 		"source-map": {
 			"version": "0.4.4",
@@ -14736,7 +13439,6 @@
 			"version": "0.5.2",
 			"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
 			"integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
-			"dev": true,
 			"requires": {
 				"atob": "^2.1.1",
 				"decode-uri-component": "^0.2.0",
@@ -14749,7 +13451,6 @@
 			"version": "0.5.6",
 			"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.6.tgz",
 			"integrity": "sha512-N4KXEz7jcKqPf2b2vZF11lQIz9W5ZMuUcIOGj243lduidkf2fjkVKJS9vNxVWn3u/uxX38AcE8U9nnH9FPcq+g==",
-			"dev": true,
 			"requires": {
 				"buffer-from": "^1.0.0",
 				"source-map": "^0.6.0"
@@ -14758,22 +13459,19 @@
 				"source-map": {
 					"version": "0.6.1",
 					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-					"dev": true
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
 				}
 			}
 		},
 		"source-map-url": {
 			"version": "0.4.0",
 			"resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
-			"integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=",
-			"dev": true
+			"integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM="
 		},
 		"spawn-command": {
 			"version": "0.0.2-1",
 			"resolved": "https://registry.npmjs.org/spawn-command/-/spawn-command-0.0.2-1.tgz",
-			"integrity": "sha1-YvXpRmmBwbeW3Fkpk34RycaSG9A=",
-			"dev": true
+			"integrity": "sha1-YvXpRmmBwbeW3Fkpk34RycaSG9A="
 		},
 		"spdx-correct": {
 			"version": "3.0.0",
@@ -14815,7 +13513,6 @@
 			"version": "3.1.0",
 			"resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
 			"integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
-			"dev": true,
 			"requires": {
 				"extend-shallow": "^3.0.0"
 			}
@@ -14831,14 +13528,12 @@
 		"sprintf-js": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.1.tgz",
-			"integrity": "sha1-Nr54Mgr+WAH2zqPueLblqrlA6gw=",
-			"dev": true
+			"integrity": "sha1-Nr54Mgr+WAH2zqPueLblqrlA6gw="
 		},
 		"sshpk": {
 			"version": "1.14.1",
 			"resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz",
 			"integrity": "sha1-Ew9Zde3a2WPx1W+SuaxsUfqfg+s=",
-			"dev": true,
 			"requires": {
 				"asn1": "~0.2.3",
 				"assert-plus": "^1.0.0",
@@ -14854,7 +13549,6 @@
 			"version": "5.3.0",
 			"resolved": "https://registry.npmjs.org/ssri/-/ssri-5.3.0.tgz",
 			"integrity": "sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==",
-			"dev": true,
 			"requires": {
 				"safe-buffer": "^5.1.1"
 			}
@@ -14862,14 +13556,12 @@
 		"stack-utils": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-1.0.1.tgz",
-			"integrity": "sha1-1PM6tU6OOHeLDKXP07OvsS22hiA=",
-			"dev": true
+			"integrity": "sha1-1PM6tU6OOHeLDKXP07OvsS22hiA="
 		},
 		"static-extend": {
 			"version": "0.1.2",
 			"resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
 			"integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
-			"dev": true,
 			"requires": {
 				"define-property": "^0.2.5",
 				"object-copy": "^0.1.0"
@@ -14879,7 +13571,6 @@
 					"version": "0.2.5",
 					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
 					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-					"dev": true,
 					"requires": {
 						"is-descriptor": "^0.1.0"
 					}
@@ -14890,7 +13581,6 @@
 			"version": "1.4.0",
 			"resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.0.tgz",
 			"integrity": "sha1-osfIWH5U2UJ+qe2zrD8s1SLfN4s=",
-			"dev": true,
 			"requires": {
 				"readable-stream": "^2.0.1"
 			}
@@ -14898,14 +13588,12 @@
 		"stealthy-require": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz",
-			"integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=",
-			"dev": true
+			"integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks="
 		},
 		"stream-browserify": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz",
 			"integrity": "sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=",
-			"dev": true,
 			"requires": {
 				"inherits": "~2.0.1",
 				"readable-stream": "^2.0.2"
@@ -14915,7 +13603,6 @@
 			"version": "1.2.2",
 			"resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.2.tgz",
 			"integrity": "sha512-mc1dbFhGBxvTM3bIWmAAINbqiuAk9TATcfIQC8P+/+HJefgaiTlMn2dHvkX8qlI12KeYKSQ1Ua9RrIqrn1VPoA==",
-			"dev": true,
 			"requires": {
 				"end-of-stream": "^1.1.0",
 				"stream-shift": "^1.0.0"
@@ -14925,7 +13612,6 @@
 			"version": "2.8.2",
 			"resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.2.tgz",
 			"integrity": "sha512-QllfrBhqF1DPcz46WxKTs6Mz1Bpc+8Qm6vbqOpVav5odAXwbyzwnEczoWqtxrsmlO+cJqtPrp/8gWKWjaKLLlA==",
-			"dev": true,
 			"requires": {
 				"builtin-status-codes": "^3.0.0",
 				"inherits": "^2.0.1",
@@ -14937,14 +13623,12 @@
 		"stream-shift": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
-			"integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
-			"dev": true
+			"integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI="
 		},
 		"stream-to-observable": {
 			"version": "0.2.0",
 			"resolved": "https://registry.npmjs.org/stream-to-observable/-/stream-to-observable-0.2.0.tgz",
 			"integrity": "sha1-WdbqOT2HwsDdrBCqDVYbxrpvDhA=",
-			"dev": true,
 			"requires": {
 				"any-observable": "^0.2.0"
 			}
@@ -14952,14 +13636,12 @@
 		"strict-uri-encode": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
-			"integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
-			"dev": true
+			"integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM="
 		},
 		"string-length": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/string-length/-/string-length-2.0.0.tgz",
 			"integrity": "sha1-1A27aGo6zpYMHP/KVivyxF+DY+0=",
-			"dev": true,
 			"requires": {
 				"astral-regex": "^1.0.0",
 				"strip-ansi": "^4.0.0"
@@ -14968,14 +13650,12 @@
 				"ansi-regex": {
 					"version": "3.0.0",
 					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-					"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-					"dev": true
+					"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
 				},
 				"strip-ansi": {
 					"version": "4.0.0",
 					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
 					"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-					"dev": true,
 					"requires": {
 						"ansi-regex": "^3.0.0"
 					}
@@ -14985,8 +13665,7 @@
 		"string-template": {
 			"version": "0.2.1",
 			"resolved": "https://registry.npmjs.org/string-template/-/string-template-0.2.1.tgz",
-			"integrity": "sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0=",
-			"dev": true
+			"integrity": "sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0="
 		},
 		"string-width": {
 			"version": "2.1.1",
@@ -15037,7 +13716,6 @@
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-2.0.0.tgz",
 			"integrity": "sha1-+H217yYT9paKpUWr/h7HKLaoKco=",
-			"dev": true,
 			"requires": {
 				"first-chunk-stream": "^2.0.0",
 				"strip-bom": "^2.0.0"
@@ -15047,7 +13725,6 @@
 					"version": "2.0.0",
 					"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
 					"integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-					"dev": true,
 					"requires": {
 						"is-utf8": "^0.2.0"
 					}
@@ -15092,7 +13769,6 @@
 			"version": "0.20.3",
 			"resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.20.3.tgz",
 			"integrity": "sha512-2I7AVP73MvK33U7B9TKlYZAqdROyMXDYSMvHLX43qy3GCOaJNiV6i0v/sv9idWIaQ42Yn2dNv79Q5mKXbKhAZg==",
-			"dev": true,
 			"requires": {
 				"loader-utils": "^1.1.0",
 				"schema-utils": "^0.4.5"
@@ -15110,7 +13786,6 @@
 			"version": "0.7.2",
 			"resolved": "https://registry.npmjs.org/svgo/-/svgo-0.7.2.tgz",
 			"integrity": "sha1-n1dyQTlSE1xv779Ar+ak+qiLS7U=",
-			"dev": true,
 			"requires": {
 				"coa": "~1.0.1",
 				"colors": "~1.1.2",
@@ -15124,20 +13799,17 @@
 				"colors": {
 					"version": "1.1.2",
 					"resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
-					"integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
-					"dev": true
+					"integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM="
 				},
 				"esprima": {
 					"version": "2.7.3",
 					"resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
-					"integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=",
-					"dev": true
+					"integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE="
 				},
 				"js-yaml": {
 					"version": "3.7.0",
 					"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz",
 					"integrity": "sha1-XJZ93YN6m/3KXy3oQlOr6KHAO4A=",
-					"dev": true,
 					"requires": {
 						"argparse": "^1.0.7",
 						"esprima": "^2.6.0"
@@ -15153,14 +13825,12 @@
 		"symbol-tree": {
 			"version": "3.2.2",
 			"resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.2.tgz",
-			"integrity": "sha1-rifbOPZgp64uHDt9G8KQgZuFGeY=",
-			"dev": true
+			"integrity": "sha1-rifbOPZgp64uHDt9G8KQgZuFGeY="
 		},
 		"table": {
 			"version": "4.0.3",
 			"resolved": "https://registry.npmjs.org/table/-/table-4.0.3.tgz",
 			"integrity": "sha512-S7rnFITmBH1EnyKcvxBh1LjYeQMmnZtCXSEbHcH6S0NoKit24ZuFO/T1vDcLdYsLQkM188PVVhQmzKIuThNkKg==",
-			"dev": true,
 			"requires": {
 				"ajv": "^6.0.1",
 				"ajv-keywords": "^3.0.0",
@@ -15174,7 +13844,6 @@
 					"version": "6.5.0",
 					"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.0.tgz",
 					"integrity": "sha512-VDUX1oSajablmiyFyED9L1DFndg0P9h7p1F+NO8FkIzei6EPrR6Zu1n18rd5P8PqaSRd/FrWv3G1TVBqpM83gA==",
-					"dev": true,
 					"requires": {
 						"fast-deep-equal": "^2.0.1",
 						"fast-json-stable-stringify": "^2.0.0",
@@ -15185,22 +13854,19 @@
 				"fast-deep-equal": {
 					"version": "2.0.1",
 					"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-					"integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
-					"dev": true
+					"integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
 				}
 			}
 		},
 		"tapable": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/tapable/-/tapable-1.0.0.tgz",
-			"integrity": "sha512-dQRhbNQkRnaqauC7WqSJ21EEksgT0fYZX2lqXzGkpo8JNig9zGZTYoMGvyI2nWmXlE2VSVXVDu7wLVGu/mQEsg==",
-			"dev": true
+			"integrity": "sha512-dQRhbNQkRnaqauC7WqSJ21EEksgT0fYZX2lqXzGkpo8JNig9zGZTYoMGvyI2nWmXlE2VSVXVDu7wLVGu/mQEsg=="
 		},
 		"tar": {
 			"version": "2.2.1",
 			"resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
 			"integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
-			"dev": true,
 			"requires": {
 				"block-stream": "*",
 				"fstream": "^1.0.2",
@@ -15211,7 +13877,6 @@
 			"version": "0.8.3",
 			"resolved": "https://registry.npmjs.org/temp/-/temp-0.8.3.tgz",
 			"integrity": "sha1-4Ma8TSa5AxJEEOT+2BEDAU38H1k=",
-			"dev": true,
 			"requires": {
 				"os-tmpdir": "^1.0.0",
 				"rimraf": "~2.2.6"
@@ -15220,8 +13885,7 @@
 				"rimraf": {
 					"version": "2.2.8",
 					"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz",
-					"integrity": "sha1-5Dm+Kq7jJzIZUnMPmaiSnk/FBYI=",
-					"dev": true
+					"integrity": "sha1-5Dm+Kq7jJzIZUnMPmaiSnk/FBYI="
 				}
 			}
 		},
@@ -15263,7 +13927,6 @@
 			"version": "4.2.1",
 			"resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-4.2.1.tgz",
 			"integrity": "sha512-qpqlP/8Zl+sosLxBcVKl9vYy26T9NPalxSzzCP/OY6K7j938ui2oKgo+kRZYfxAeIpLqpbVnsHq1tyV70E4lWQ==",
-			"dev": true,
 			"requires": {
 				"arrify": "^1.0.1",
 				"micromatch": "^3.1.8",
@@ -15280,20 +13943,17 @@
 		"text-table": {
 			"version": "0.2.0",
 			"resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-			"integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
-			"dev": true
+			"integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ="
 		},
 		"textextensions": {
 			"version": "2.2.0",
 			"resolved": "https://registry.npmjs.org/textextensions/-/textextensions-2.2.0.tgz",
-			"integrity": "sha512-j5EMxnryTvKxwH2Cq+Pb43tsf6sdEgw6Pdwxk83mPaq0ToeFJt6WE4J3s5BqY7vmjlLgkgXvhtXUxo80FyBhCA==",
-			"dev": true
+			"integrity": "sha512-j5EMxnryTvKxwH2Cq+Pb43tsf6sdEgw6Pdwxk83mPaq0ToeFJt6WE4J3s5BqY7vmjlLgkgXvhtXUxo80FyBhCA=="
 		},
 		"throat": {
 			"version": "4.1.0",
 			"resolved": "https://registry.npmjs.org/throat/-/throat-4.1.0.tgz",
-			"integrity": "sha1-iQN8vJLFarGJJua6TLsgDhVnKmo=",
-			"dev": true
+			"integrity": "sha1-iQN8vJLFarGJJua6TLsgDhVnKmo="
 		},
 		"through": {
 			"version": "2.3.8",
@@ -15318,7 +13978,6 @@
 			"version": "2.0.10",
 			"resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.10.tgz",
 			"integrity": "sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==",
-			"dev": true,
 			"requires": {
 				"setimmediate": "^1.0.4"
 			}
@@ -15332,7 +13991,6 @@
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/tiny-lr/-/tiny-lr-1.1.1.tgz",
 			"integrity": "sha512-44yhA3tsaRoMOjQQ+5v5mVdqef+kH6Qze9jTpqtVufgYjYt08zyZAwNwwVBj3i1rJMnR52IxOW0LK0vBzgAkuA==",
-			"dev": true,
 			"requires": {
 				"body": "^5.1.0",
 				"debug": "^3.1.0",
@@ -15346,7 +14004,6 @@
 					"version": "3.1.0",
 					"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
 					"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-					"dev": true,
 					"requires": {
 						"ms": "2.0.0"
 					}
@@ -15374,26 +14031,22 @@
 		"tmpl": {
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz",
-			"integrity": "sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=",
-			"dev": true
+			"integrity": "sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE="
 		},
 		"to-arraybuffer": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
-			"integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
-			"dev": true
+			"integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M="
 		},
 		"to-fast-properties": {
 			"version": "1.0.3",
 			"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
-			"integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
-			"dev": true
+			"integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc="
 		},
 		"to-object-path": {
 			"version": "0.3.0",
 			"resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
 			"integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
-			"dev": true,
 			"requires": {
 				"kind-of": "^3.0.2"
 			}
@@ -15402,7 +14055,6 @@
 			"version": "3.0.2",
 			"resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
 			"integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
-			"dev": true,
 			"requires": {
 				"define-property": "^2.0.2",
 				"extend-shallow": "^3.0.2",
@@ -15414,7 +14066,6 @@
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
 			"integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-			"dev": true,
 			"requires": {
 				"is-number": "^3.0.0",
 				"repeat-string": "^1.6.1"
@@ -15424,7 +14075,6 @@
 			"version": "2.3.4",
 			"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz",
 			"integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==",
-			"dev": true,
 			"requires": {
 				"punycode": "^1.4.1"
 			},
@@ -15432,8 +14082,7 @@
 				"punycode": {
 					"version": "1.4.1",
 					"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-					"integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-					"dev": true
+					"integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
 				}
 			}
 		},
@@ -15441,7 +14090,6 @@
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz",
 			"integrity": "sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=",
-			"dev": true,
 			"requires": {
 				"punycode": "^2.1.0"
 			}
@@ -15449,8 +14097,7 @@
 		"tree-kill": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.0.tgz",
-			"integrity": "sha512-DlX6dR0lOIRDFxI0mjL9IYg6OTncLm/Zt+JiBhE5OlFcAR8yc9S7FFXU9so0oda47frdM/JFsk7UjNt9vscKcg==",
-			"dev": true
+			"integrity": "sha512-DlX6dR0lOIRDFxI0mjL9IYg6OTncLm/Zt+JiBhE5OlFcAR8yc9S7FFXU9so0oda47frdM/JFsk7UjNt9vscKcg=="
 		},
 		"trim-newlines": {
 			"version": "2.0.0",
@@ -15465,14 +14112,12 @@
 		"trim-right": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
-			"integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
-			"dev": true
+			"integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM="
 		},
 		"true-case-path": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.2.tgz",
 			"integrity": "sha1-fskRMJJHZsf1c74wIMNPj9/QDWI=",
-			"dev": true,
 			"requires": {
 				"glob": "^6.0.4"
 			},
@@ -15481,7 +14126,6 @@
 					"version": "6.0.4",
 					"resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
 					"integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=",
-					"dev": true,
 					"requires": {
 						"inflight": "^1.0.4",
 						"inherits": "2",
@@ -15495,14 +14139,12 @@
 		"tty-browserify": {
 			"version": "0.0.0",
 			"resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
-			"integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
-			"dev": true
+			"integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY="
 		},
 		"tunnel-agent": {
 			"version": "0.6.0",
 			"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
 			"integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-			"dev": true,
 			"requires": {
 				"safe-buffer": "^5.0.1"
 			}
@@ -15511,14 +14153,12 @@
 			"version": "0.14.5",
 			"resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
 			"integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
-			"dev": true,
 			"optional": true
 		},
 		"type-check": {
 			"version": "0.3.2",
 			"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
 			"integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
-			"dev": true,
 			"requires": {
 				"prelude-ls": "~1.1.2"
 			}
@@ -15574,7 +14214,6 @@
 			"version": "1.2.5",
 			"resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.5.tgz",
 			"integrity": "sha512-hIQJ1yxAPhEA2yW/i7Fr+SXZVMp+VEI3d42RTHBgQd2yhp/1UdBcR3QEWPV5ahBxlqQDMEMTuTEvDHSFINfwSw==",
-			"dev": true,
 			"requires": {
 				"cacache": "^10.0.4",
 				"find-cache-dir": "^1.0.0",
@@ -15589,20 +14228,17 @@
 				"commander": {
 					"version": "2.13.0",
 					"resolved": "https://registry.npmjs.org/commander/-/commander-2.13.0.tgz",
-					"integrity": "sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA==",
-					"dev": true
+					"integrity": "sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA=="
 				},
 				"source-map": {
 					"version": "0.6.1",
 					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-					"dev": true
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
 				},
 				"uglify-es": {
 					"version": "3.3.9",
 					"resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.3.9.tgz",
 					"integrity": "sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ==",
-					"dev": true,
 					"requires": {
 						"commander": "~2.13.0",
 						"source-map": "~0.6.1"
@@ -15613,20 +14249,17 @@
 		"ultron": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
-			"integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==",
-			"dev": true
+			"integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og=="
 		},
 		"underscore": {
 			"version": "1.4.4",
 			"resolved": "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz",
-			"integrity": "sha1-YaajIBBiKvoHljvzJSA88SI51gQ=",
-			"dev": true
+			"integrity": "sha1-YaajIBBiKvoHljvzJSA88SI51gQ="
 		},
 		"union-value": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz",
 			"integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=",
-			"dev": true,
 			"requires": {
 				"arr-union": "^3.1.0",
 				"get-value": "^2.0.6",
@@ -15638,7 +14271,6 @@
 					"version": "2.0.1",
 					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
 					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-					"dev": true,
 					"requires": {
 						"is-extendable": "^0.1.0"
 					}
@@ -15647,7 +14279,6 @@
 					"version": "0.4.3",
 					"resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz",
 					"integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=",
-					"dev": true,
 					"requires": {
 						"extend-shallow": "^2.0.1",
 						"is-extendable": "^0.1.1",
@@ -15660,20 +14291,17 @@
 		"uniq": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
-			"integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=",
-			"dev": true
+			"integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8="
 		},
 		"uniqs": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz",
-			"integrity": "sha1-/+3ks2slKQaW5uFl1KWe25mOawI=",
-			"dev": true
+			"integrity": "sha1-/+3ks2slKQaW5uFl1KWe25mOawI="
 		},
 		"unique-filename": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.0.tgz",
 			"integrity": "sha1-0F8v5AMlYIcfMOk8vnNe6iAVFPM=",
-			"dev": true,
 			"requires": {
 				"unique-slug": "^2.0.0"
 			}
@@ -15682,7 +14310,6 @@
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.0.tgz",
 			"integrity": "sha1-22Z258fMBimHj/GWCXx4hVrp9Ks=",
-			"dev": true,
 			"requires": {
 				"imurmurhash": "^0.1.4"
 			}
@@ -15696,7 +14323,6 @@
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
 			"integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
-			"dev": true,
 			"requires": {
 				"has-value": "^0.3.1",
 				"isobject": "^3.0.0"
@@ -15706,7 +14332,6 @@
 					"version": "0.3.1",
 					"resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
 					"integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
-					"dev": true,
 					"requires": {
 						"get-value": "^2.0.3",
 						"has-values": "^0.1.4",
@@ -15717,7 +14342,6 @@
 							"version": "2.1.0",
 							"resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
 							"integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-							"dev": true,
 							"requires": {
 								"isarray": "1.0.0"
 							}
@@ -15727,16 +14351,14 @@
 				"has-values": {
 					"version": "0.1.4",
 					"resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
-					"integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
-					"dev": true
+					"integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E="
 				}
 			}
 		},
 		"untildify": {
 			"version": "3.0.2",
 			"resolved": "https://registry.npmjs.org/untildify/-/untildify-3.0.2.tgz",
-			"integrity": "sha1-fx8wIFWz/qDz6B3HjrNnZstl4/E=",
-			"dev": true
+			"integrity": "sha1-fx8wIFWz/qDz6B3HjrNnZstl4/E="
 		},
 		"unzip-response": {
 			"version": "2.0.1",
@@ -15746,14 +14368,12 @@
 		"upath": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz",
-			"integrity": "sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==",
-			"dev": true
+			"integrity": "sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw=="
 		},
 		"uri-js": {
 			"version": "4.2.1",
 			"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.1.tgz",
 			"integrity": "sha512-jpKCA3HjsBfSDOEgxRDAxQCNyHfCPSbq57PqCkd3gAyBuPb3IWxw54EHncqESznIdqSetHfw3D7ylThu2Kcc9A==",
-			"dev": true,
 			"requires": {
 				"punycode": "^2.1.0"
 			}
@@ -15761,14 +14381,12 @@
 		"urix": {
 			"version": "0.1.0",
 			"resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
-			"integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
-			"dev": true
+			"integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI="
 		},
 		"url": {
 			"version": "0.11.0",
 			"resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
 			"integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
-			"dev": true,
 			"requires": {
 				"punycode": "1.3.2",
 				"querystring": "0.2.0"
@@ -15777,8 +14395,7 @@
 				"punycode": {
 					"version": "1.3.2",
 					"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-					"integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
-					"dev": true
+					"integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0="
 				}
 			}
 		},
@@ -15793,20 +14410,17 @@
 		"url-to-options": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/url-to-options/-/url-to-options-1.0.1.tgz",
-			"integrity": "sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k=",
-			"dev": true
+			"integrity": "sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k="
 		},
 		"urlgrey": {
 			"version": "0.4.4",
 			"resolved": "https://registry.npmjs.org/urlgrey/-/urlgrey-0.4.4.tgz",
-			"integrity": "sha1-iS/pWWCAXoVRnxzUOJ8stMu3ZS8=",
-			"dev": true
+			"integrity": "sha1-iS/pWWCAXoVRnxzUOJ8stMu3ZS8="
 		},
 		"use": {
 			"version": "3.1.0",
 			"resolved": "https://registry.npmjs.org/use/-/use-3.1.0.tgz",
 			"integrity": "sha512-6UJEQM/L+mzC3ZJNM56Q4DFGLX/evKGRg15UJHGB9X5j5Z3AFbgZvjUh2yq/UJUY4U5dh7Fal++XbNg1uzpRAw==",
-			"dev": true,
 			"requires": {
 				"kind-of": "^6.0.2"
 			},
@@ -15814,8 +14428,7 @@
 				"kind-of": {
 					"version": "6.0.2",
 					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-					"dev": true
+					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
 				}
 			}
 		},
@@ -15823,7 +14436,6 @@
 			"version": "0.10.3",
 			"resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
 			"integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
-			"dev": true,
 			"requires": {
 				"inherits": "2.0.1"
 			},
@@ -15831,8 +14443,7 @@
 				"inherits": {
 					"version": "2.0.1",
 					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-					"integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
-					"dev": true
+					"integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE="
 				}
 			}
 		},
@@ -15845,7 +14456,6 @@
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz",
 			"integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==",
-			"dev": true,
 			"requires": {
 				"define-properties": "^1.1.2",
 				"object.getownpropertydescriptors": "^2.0.3"
@@ -15859,8 +14469,7 @@
 		"v8-compile-cache": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-1.1.2.tgz",
-			"integrity": "sha512-ejdrifsIydN1XDH7EuR2hn8ZrkRKUYF7tUcBjBy/lhrCvs2K+zRlbW9UHc0IQ9RsYFZJFqJrieoIHfkCa0DBRA==",
-			"dev": true
+			"integrity": "sha512-ejdrifsIydN1XDH7EuR2hn8ZrkRKUYF7tUcBjBy/lhrCvs2K+zRlbW9UHc0IQ9RsYFZJFqJrieoIHfkCa0DBRA=="
 		},
 		"validate-npm-package-license": {
 			"version": "3.0.3",
@@ -15874,20 +14483,17 @@
 		"validator": {
 			"version": "10.2.0",
 			"resolved": "https://registry.npmjs.org/validator/-/validator-10.2.0.tgz",
-			"integrity": "sha512-gz/uknWtNfZTj1BLUzYHDxOoiQ7A4wZ6xPuuE6RpxswR4cNyT4I5kN9jmU0AQr7IBEap9vfYChI2TpssTN6Itg==",
-			"dev": true
+			"integrity": "sha512-gz/uknWtNfZTj1BLUzYHDxOoiQ7A4wZ6xPuuE6RpxswR4cNyT4I5kN9jmU0AQr7IBEap9vfYChI2TpssTN6Itg=="
 		},
 		"vendors": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.2.tgz",
-			"integrity": "sha512-w/hry/368nO21AN9QljsaIhb9ZiZtZARoVH5f3CsFbawdLdayCgKRPup7CggujvySMxx0I91NOyxdVENohprLQ==",
-			"dev": true
+			"integrity": "sha512-w/hry/368nO21AN9QljsaIhb9ZiZtZARoVH5f3CsFbawdLdayCgKRPup7CggujvySMxx0I91NOyxdVENohprLQ=="
 		},
 		"verror": {
 			"version": "1.10.0",
 			"resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
 			"integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-			"dev": true,
 			"requires": {
 				"assert-plus": "^1.0.0",
 				"core-util-is": "1.0.2",
@@ -15898,7 +14504,6 @@
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
 			"integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
-			"dev": true,
 			"requires": {
 				"clone": "^1.0.0",
 				"clone-stats": "^0.0.1",
@@ -15909,7 +14514,6 @@
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/vinyl-file/-/vinyl-file-2.0.0.tgz",
 			"integrity": "sha1-p+v1/779obfRjRQPyweyI++2dRo=",
-			"dev": true,
 			"requires": {
 				"graceful-fs": "^4.1.2",
 				"pify": "^2.3.0",
@@ -15922,14 +14526,12 @@
 				"pify": {
 					"version": "2.3.0",
 					"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-					"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-					"dev": true
+					"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
 				},
 				"strip-bom": {
 					"version": "2.0.0",
 					"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
 					"integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-					"dev": true,
 					"requires": {
 						"is-utf8": "^0.2.0"
 					}
@@ -15940,7 +14542,6 @@
 			"version": "0.0.4",
 			"resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
 			"integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=",
-			"dev": true,
 			"requires": {
 				"indexof": "0.0.1"
 			}
@@ -15949,7 +14550,6 @@
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz",
 			"integrity": "sha1-gqwr/2PZUOqeMYmlimViX+3xkEU=",
-			"dev": true,
 			"requires": {
 				"browser-process-hrtime": "^0.1.2"
 			}
@@ -15958,7 +14558,6 @@
 			"version": "1.0.7",
 			"resolved": "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz",
 			"integrity": "sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=",
-			"dev": true,
 			"requires": {
 				"makeerror": "1.0.x"
 			}
@@ -15967,7 +14566,6 @@
 			"version": "0.18.0",
 			"resolved": "https://registry.npmjs.org/watch/-/watch-0.18.0.tgz",
 			"integrity": "sha1-KAlUdsbffJDJYxOJkMClQj60uYY=",
-			"dev": true,
 			"requires": {
 				"exec-sh": "^0.2.0",
 				"minimist": "^1.2.0"
@@ -15976,8 +14574,7 @@
 				"minimist": {
 					"version": "1.2.0",
 					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-					"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-					"dev": true
+					"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
 				}
 			}
 		},
@@ -15985,7 +14582,6 @@
 			"version": "1.6.0",
 			"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz",
 			"integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==",
-			"dev": true,
 			"requires": {
 				"chokidar": "^2.0.2",
 				"graceful-fs": "^4.1.2",
@@ -16004,7 +14600,6 @@
 			"version": "1.4.3",
 			"resolved": "https://registry.npmjs.org/webassemblyjs/-/webassemblyjs-1.4.3.tgz",
 			"integrity": "sha512-4lOV1Lv6olz0PJkDGQEp82HempAn147e6BXijWDzz9g7/2nSebVP9GVg62Fz5ZAs55mxq13GA0XLyvY8XkyDjg==",
-			"dev": true,
 			"requires": {
 				"@webassemblyjs/ast": "1.4.3",
 				"@webassemblyjs/validation": "1.4.3",
@@ -16016,14 +14611,12 @@
 		"webidl-conversions": {
 			"version": "4.0.2",
 			"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",
-			"integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==",
-			"dev": true
+			"integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="
 		},
 		"webpack": {
 			"version": "4.8.3",
 			"resolved": "https://registry.npmjs.org/webpack/-/webpack-4.8.3.tgz",
 			"integrity": "sha512-/hfAjBISycdK597lxONjKEFX7dSIU1PsYwC3XlXUXoykWBlv9QV5HnO+ql3HvrrgfBJ7WXdnjO9iGPR2aAc5sw==",
-			"dev": true,
 			"requires": {
 				"@webassemblyjs/ast": "1.4.3",
 				"@webassemblyjs/wasm-edit": "1.4.3",
@@ -16053,7 +14646,6 @@
 					"version": "6.5.0",
 					"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.0.tgz",
 					"integrity": "sha512-VDUX1oSajablmiyFyED9L1DFndg0P9h7p1F+NO8FkIzei6EPrR6Zu1n18rd5P8PqaSRd/FrWv3G1TVBqpM83gA==",
-					"dev": true,
 					"requires": {
 						"fast-deep-equal": "^2.0.1",
 						"fast-json-stable-stringify": "^2.0.0",
@@ -16064,8 +14656,7 @@
 				"fast-deep-equal": {
 					"version": "2.0.1",
 					"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-					"integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
-					"dev": true
+					"integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
 				}
 			}
 		},
@@ -16073,7 +14664,6 @@
 			"version": "1.1.5",
 			"resolved": "https://registry.npmjs.org/webpack-addons/-/webpack-addons-1.1.5.tgz",
 			"integrity": "sha512-MGO0nVniCLFAQz1qv22zM02QPjcpAoJdy7ED0i3Zy7SY1IecgXCm460ib7H/Wq7e9oL5VL6S2BxaObxwIcag0g==",
-			"dev": true,
 			"requires": {
 				"jscodeshift": "^0.4.0"
 			},
@@ -16081,14 +14671,12 @@
 				"ansi-styles": {
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.0.0.tgz",
-					"integrity": "sha1-yxAt8cVvUSPquLZ817mAJ6AnkXg=",
-					"dev": true
+					"integrity": "sha1-yxAt8cVvUSPquLZ817mAJ6AnkXg="
 				},
 				"arr-diff": {
 					"version": "2.0.0",
 					"resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
 					"integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
-					"dev": true,
 					"requires": {
 						"arr-flatten": "^1.0.1"
 					}
@@ -16096,20 +14684,17 @@
 				"array-unique": {
 					"version": "0.2.1",
 					"resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
-					"integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
-					"dev": true
+					"integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM="
 				},
 				"ast-types": {
 					"version": "0.10.1",
 					"resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.10.1.tgz",
-					"integrity": "sha512-UY7+9DPzlJ9VM8eY0b2TUZcZvF+1pO0hzMtAyjBYKhOmnvRlqYNYnWdtsMj0V16CGaMlpL0G1jnLbLo4AyotuQ==",
-					"dev": true
+					"integrity": "sha512-UY7+9DPzlJ9VM8eY0b2TUZcZvF+1pO0hzMtAyjBYKhOmnvRlqYNYnWdtsMj0V16CGaMlpL0G1jnLbLo4AyotuQ=="
 				},
 				"braces": {
 					"version": "1.8.5",
 					"resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
 					"integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
-					"dev": true,
 					"requires": {
 						"expand-range": "^1.8.1",
 						"preserve": "^0.2.0",
@@ -16120,7 +14705,6 @@
 					"version": "0.4.0",
 					"resolved": "https://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz",
 					"integrity": "sha1-UZmj3c0MHv4jvAjBsCewYXbgxk8=",
-					"dev": true,
 					"requires": {
 						"ansi-styles": "~1.0.0",
 						"has-color": "~0.1.0",
@@ -16130,14 +14714,12 @@
 				"colors": {
 					"version": "1.2.5",
 					"resolved": "https://registry.npmjs.org/colors/-/colors-1.2.5.tgz",
-					"integrity": "sha512-erNRLao/Y3Fv54qUa0LBB+//Uf3YwMUmdJinN20yMXm9zdKKqH9wt7R9IIVZ+K7ShzfpLV/Zg8+VyrBJYB4lpg==",
-					"dev": true
+					"integrity": "sha512-erNRLao/Y3Fv54qUa0LBB+//Uf3YwMUmdJinN20yMXm9zdKKqH9wt7R9IIVZ+K7ShzfpLV/Zg8+VyrBJYB4lpg=="
 				},
 				"expand-brackets": {
 					"version": "0.1.5",
 					"resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
 					"integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
-					"dev": true,
 					"requires": {
 						"is-posix-bracket": "^0.1.0"
 					}
@@ -16146,7 +14728,6 @@
 					"version": "0.3.2",
 					"resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
 					"integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
-					"dev": true,
 					"requires": {
 						"is-extglob": "^1.0.0"
 					}
@@ -16154,14 +14735,12 @@
 				"is-extglob": {
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-					"integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-					"dev": true
+					"integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA="
 				},
 				"is-glob": {
 					"version": "2.0.1",
 					"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
 					"integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-					"dev": true,
 					"requires": {
 						"is-extglob": "^1.0.0"
 					}
@@ -16170,7 +14749,6 @@
 					"version": "0.4.1",
 					"resolved": "https://registry.npmjs.org/jscodeshift/-/jscodeshift-0.4.1.tgz",
 					"integrity": "sha512-iOX6If+hsw0q99V3n31t4f5VlD1TQZddH08xbT65ZqA7T4Vkx68emrDZMUOLVvCEAJ6NpAk7DECe3fjC/t52AQ==",
-					"dev": true,
 					"requires": {
 						"async": "^1.5.0",
 						"babel-plugin-transform-flow-strip-types": "^6.8.0",
@@ -16193,7 +14771,6 @@
 					"version": "2.3.11",
 					"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
 					"integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
-					"dev": true,
 					"requires": {
 						"arr-diff": "^2.0.0",
 						"array-unique": "^0.2.1",
@@ -16214,7 +14791,6 @@
 					"version": "1.8.1",
 					"resolved": "https://registry.npmjs.org/nomnom/-/nomnom-1.8.1.tgz",
 					"integrity": "sha1-IVH3Ikcrp55Qp2/BJbuMjy5Nwqc=",
-					"dev": true,
 					"requires": {
 						"chalk": "~0.4.0",
 						"underscore": "~1.6.0"
@@ -16224,7 +14800,6 @@
 					"version": "0.12.9",
 					"resolved": "https://registry.npmjs.org/recast/-/recast-0.12.9.tgz",
 					"integrity": "sha512-y7ANxCWmMW8xLOaiopiRDlyjQ9ajKRENBH+2wjntIbk3A6ZR1+BLQttkmSHMY7Arl+AAZFwJ10grg2T6f1WI8A==",
-					"dev": true,
 					"requires": {
 						"ast-types": "0.10.1",
 						"core-js": "^2.4.1",
@@ -16236,26 +14811,22 @@
 				"source-map": {
 					"version": "0.6.1",
 					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-					"dev": true
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
 				},
 				"strip-ansi": {
 					"version": "0.1.1",
 					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz",
-					"integrity": "sha1-OeipjQRNFQZgq+SmgIrPcLt7yZE=",
-					"dev": true
+					"integrity": "sha1-OeipjQRNFQZgq+SmgIrPcLt7yZE="
 				},
 				"underscore": {
 					"version": "1.6.0",
 					"resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz",
-					"integrity": "sha1-izixDKze9jM3uLJOT/htRa6lKag=",
-					"dev": true
+					"integrity": "sha1-izixDKze9jM3uLJOT/htRa6lKag="
 				},
 				"write-file-atomic": {
 					"version": "1.3.4",
 					"resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.4.tgz",
 					"integrity": "sha1-+Aek8LHZ6ROuekgRLmzDrxmRtF8=",
-					"dev": true,
 					"requires": {
 						"graceful-fs": "^4.1.11",
 						"imurmurhash": "^0.1.4",
@@ -16268,7 +14839,6 @@
 			"version": "2.1.3",
 			"resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-2.1.3.tgz",
 			"integrity": "sha512-5AsKoL/Ccn8iTrwk3uErdyhetGH+c7VRQ7Itim2GL0IhBRq5rtojVDk00buMRmFmBpw1RvHXq97Gup965LbozA==",
-			"dev": true,
 			"requires": {
 				"chalk": "^2.3.2",
 				"cross-spawn": "^6.0.5",
@@ -16301,20 +14871,17 @@
 				"ansi-regex": {
 					"version": "3.0.0",
 					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-					"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-					"dev": true
+					"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
 				},
 				"camelcase": {
 					"version": "4.1.0",
 					"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
-					"integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
-					"dev": true
+					"integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0="
 				},
 				"cliui": {
 					"version": "4.1.0",
 					"resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
 					"integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
-					"dev": true,
 					"requires": {
 						"string-width": "^2.1.1",
 						"strip-ansi": "^4.0.0",
@@ -16325,7 +14892,6 @@
 					"version": "6.0.5",
 					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
 					"integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-					"dev": true,
 					"requires": {
 						"nice-try": "^1.0.4",
 						"path-key": "^2.0.1",
@@ -16338,7 +14904,6 @@
 					"version": "8.3.1",
 					"resolved": "https://registry.npmjs.org/got/-/got-8.3.1.tgz",
 					"integrity": "sha512-tiLX+bnYm5A56T5N/n9Xo89vMaO1mrS9qoDqj3u/anVooqGozvY/HbXzEpDfbNeKsHCBpK40gSbz8wGYSp3i1w==",
-					"dev": true,
 					"requires": {
 						"@sindresorhus/is": "^0.7.0",
 						"cacheable-request": "^2.1.1",
@@ -16363,7 +14928,6 @@
 					"version": "5.2.0",
 					"resolved": "https://registry.npmjs.org/inquirer/-/inquirer-5.2.0.tgz",
 					"integrity": "sha512-E9BmnJbAKLPGonz0HeWHtbKf+EeSP93paWO3ZYoUpq/aowXvYGjjCSuashhXPpzbArIjBbji39THkxTz9ZeEUQ==",
-					"dev": true,
 					"requires": {
 						"ansi-escapes": "^3.0.0",
 						"chalk": "^2.0.0",
@@ -16383,14 +14947,12 @@
 				"prepend-http": {
 					"version": "2.0.0",
 					"resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz",
-					"integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=",
-					"dev": true
+					"integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc="
 				},
 				"strip-ansi": {
 					"version": "4.0.0",
 					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
 					"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-					"dev": true,
 					"requires": {
 						"ansi-regex": "^3.0.0"
 					}
@@ -16399,7 +14961,6 @@
 					"version": "3.0.0",
 					"resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz",
 					"integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=",
-					"dev": true,
 					"requires": {
 						"prepend-http": "^2.0.0"
 					}
@@ -16408,7 +14969,6 @@
 					"version": "11.1.0",
 					"resolved": "https://registry.npmjs.org/yargs/-/yargs-11.1.0.tgz",
 					"integrity": "sha512-NwW69J42EsCSanF8kyn5upxvjp5ds+t3+udGBeTbFnERA+lF541DDpMawzo4z6W/QrzNM18D+BPMiOBibnFV5A==",
-					"dev": true,
 					"requires": {
 						"cliui": "^4.0.0",
 						"decamelize": "^1.1.1",
@@ -16428,7 +14988,6 @@
 					"version": "9.0.2",
 					"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-9.0.2.tgz",
 					"integrity": "sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=",
-					"dev": true,
 					"requires": {
 						"camelcase": "^4.1.0"
 					}
@@ -16439,7 +14998,6 @@
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/webpack-livereload-plugin/-/webpack-livereload-plugin-2.1.1.tgz",
 			"integrity": "sha512-W7Q55QbPvVJotpIZSjjwzmqQ22333ExYxWM3WFlHKkbPStQqVRSmJkjntUqXF9jtpdeXi8r8HLkA1RVnAP0SQA==",
-			"dev": true,
 			"requires": {
 				"tiny-lr": "^1.1.1"
 			}
@@ -16447,7 +15005,6 @@
 		"webpack-rtl-plugin": {
 			"version": "github:yoavf/webpack-rtl-plugin#fc5a2f20dd99fde8f86f297844aefde601780fa3",
 			"from": "github:yoavf/webpack-rtl-plugin#develop",
-			"dev": true,
 			"requires": {
 				"@romainberger/css-diff": "^1.0.3",
 				"async": "^2.0.0-rc.6",
@@ -16460,14 +15017,12 @@
 				"ansi-styles": {
 					"version": "2.2.1",
 					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-					"dev": true
+					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
 				},
 				"async": {
 					"version": "2.6.0",
 					"resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz",
 					"integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==",
-					"dev": true,
 					"requires": {
 						"lodash": "^4.14.0"
 					}
@@ -16476,7 +15031,6 @@
 					"version": "1.1.3",
 					"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
 					"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-					"dev": true,
 					"requires": {
 						"ansi-styles": "^2.2.1",
 						"escape-string-regexp": "^1.0.2",
@@ -16488,22 +15042,19 @@
 						"supports-color": {
 							"version": "2.0.0",
 							"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-							"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-							"dev": true
+							"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
 						}
 					}
 				},
 				"has-flag": {
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-					"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-					"dev": true
+					"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
 				},
 				"postcss": {
 					"version": "5.2.18",
 					"resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
 					"integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-					"dev": true,
 					"requires": {
 						"chalk": "^1.1.3",
 						"js-base64": "^2.1.9",
@@ -16514,20 +15065,17 @@
 				"source-list-map": {
 					"version": "0.1.8",
 					"resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.8.tgz",
-					"integrity": "sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=",
-					"dev": true
+					"integrity": "sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY="
 				},
 				"source-map": {
 					"version": "0.5.7",
 					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-					"dev": true
+					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
 				},
 				"supports-color": {
 					"version": "3.2.3",
 					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
 					"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-					"dev": true,
 					"requires": {
 						"has-flag": "^1.0.0"
 					}
@@ -16536,7 +15084,6 @@
 					"version": "0.1.5",
 					"resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-0.1.5.tgz",
 					"integrity": "sha1-qh86vw8NdNtxEcQOUAuE+WZkB1A=",
-					"dev": true,
 					"requires": {
 						"source-list-map": "~0.1.7",
 						"source-map": "~0.5.3"
@@ -16548,7 +15095,6 @@
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.1.0.tgz",
 			"integrity": "sha512-aqYp18kPphgoO5c/+NaUvEeACtZjMESmDChuD3NBciVpah3XpMEU9VAAtIaB1BsfJWWTSdv8Vv1m3T0aRk2dUw==",
-			"dev": true,
 			"requires": {
 				"source-list-map": "^2.0.0",
 				"source-map": "~0.6.1"
@@ -16557,8 +15103,7 @@
 				"source-map": {
 					"version": "0.6.1",
 					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-					"dev": true
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
 				}
 			}
 		},
@@ -16566,7 +15111,6 @@
 			"version": "0.7.0",
 			"resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.0.tgz",
 			"integrity": "sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=",
-			"dev": true,
 			"requires": {
 				"http-parser-js": ">=0.4.0",
 				"websocket-extensions": ">=0.1.1"
@@ -16575,14 +15119,12 @@
 		"websocket-extensions": {
 			"version": "0.1.3",
 			"resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz",
-			"integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==",
-			"dev": true
+			"integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg=="
 		},
 		"whatwg-encoding": {
 			"version": "1.0.3",
 			"resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.3.tgz",
 			"integrity": "sha512-jLBwwKUhi8WtBfsMQlL4bUUcT8sMkAtQinscJAe/M4KHCkHuUJAF6vuB0tueNIw4c8ziO6AkRmgY+jL3a0iiPw==",
-			"dev": true,
 			"requires": {
 				"iconv-lite": "0.4.19"
 			},
@@ -16590,8 +15132,7 @@
 				"iconv-lite": {
 					"version": "0.4.19",
 					"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz",
-					"integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==",
-					"dev": true
+					"integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ=="
 				}
 			}
 		},
@@ -16603,14 +15144,12 @@
 		"whatwg-mimetype": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.1.0.tgz",
-			"integrity": "sha512-FKxhYLytBQiUKjkYteN71fAUA3g6KpNXoho1isLiLSB3N1G4F35Q5vUxWfKFhBwi5IWF27VE6WxhrnnC+m0Mew==",
-			"dev": true
+			"integrity": "sha512-FKxhYLytBQiUKjkYteN71fAUA3g6KpNXoho1isLiLSB3N1G4F35Q5vUxWfKFhBwi5IWF27VE6WxhrnnC+m0Mew=="
 		},
 		"whatwg-url": {
 			"version": "6.4.1",
 			"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.4.1.tgz",
 			"integrity": "sha512-FwygsxsXx27x6XXuExA/ox3Ktwcbf+OAvrKmLulotDAiO1Q6ixchPFaHYsis2zZBZSJTR0+dR+JVtf7MlbqZjw==",
-			"dev": true,
 			"requires": {
 				"lodash.sortby": "^4.7.0",
 				"tr46": "^1.0.1",
@@ -16620,8 +15159,7 @@
 		"whet.extend": {
 			"version": "0.9.9",
 			"resolved": "https://registry.npmjs.org/whet.extend/-/whet.extend-0.9.9.tgz",
-			"integrity": "sha1-+HfVv2SMl+WqVC+twW1qJZucEaE=",
-			"dev": true
+			"integrity": "sha1-+HfVv2SMl+WqVC+twW1qJZucEaE="
 		},
 		"which": {
 			"version": "1.3.0",
@@ -16679,7 +15217,6 @@
 			"version": "1.6.0",
 			"resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.6.0.tgz",
 			"integrity": "sha512-6w+3tHbM87WnSWnENBUvA2pxJPLhQUg5LKwUQHq3r+XPhIM+Gh2R5ycbwPCyuGbNg+lPgdcnQUhuC02kJCvffQ==",
-			"dev": true,
 			"requires": {
 				"errno": "~0.1.7"
 			}
@@ -16722,7 +15259,6 @@
 			"version": "0.2.1",
 			"resolved": "https://registry.npmjs.org/write/-/write-0.2.1.tgz",
 			"integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=",
-			"dev": true,
 			"requires": {
 				"mkdirp": "^0.5.1"
 			}
@@ -16763,7 +15299,6 @@
 			"version": "4.1.0",
 			"resolved": "https://registry.npmjs.org/ws/-/ws-4.1.0.tgz",
 			"integrity": "sha512-ZGh/8kF9rrRNffkLFV4AzhvooEclrOH0xaugmqGsIfFgOE/pIz4fMc4Ef+5HSQqTEug2S9JZIWDR47duDSLfaA==",
-			"dev": true,
 			"requires": {
 				"async-limiter": "~1.0.0",
 				"safe-buffer": "~5.1.0"
@@ -16772,8 +15307,7 @@
 		"xml-name-validator": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
-			"integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==",
-			"dev": true
+			"integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw=="
 		},
 		"xtend": {
 			"version": "4.0.1",
@@ -16917,7 +15451,6 @@
 			"version": "2.4.1",
 			"resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz",
 			"integrity": "sha1-lSj0QtqxsihOWLQ3m7GU4i4MQAU=",
-			"dev": true,
 			"requires": {
 				"fd-slicer": "~1.0.1"
 			}
@@ -16926,7 +15459,6 @@
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.1.1.tgz",
 			"integrity": "sha512-IBLwCUrJrDxBYuwdYm1wuF3O/CR2LpXR0rFS684QOrU6x69DPPrsdd20dZOFaedZ/M9sON7po73WhO3I1CbgNQ==",
-			"dev": true,
 			"requires": {
 				"chalk": "^2.1.0",
 				"cross-spawn": "^6.0.5",
@@ -16948,14 +15480,12 @@
 				"ansi-regex": {
 					"version": "3.0.0",
 					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-					"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-					"dev": true
+					"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
 				},
 				"cross-spawn": {
 					"version": "6.0.5",
 					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
 					"integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-					"dev": true,
 					"requires": {
 						"nice-try": "^1.0.4",
 						"path-key": "^2.0.1",
@@ -16968,7 +15498,6 @@
 					"version": "3.1.0",
 					"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
 					"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-					"dev": true,
 					"requires": {
 						"ms": "2.0.0"
 					}
@@ -16977,7 +15506,6 @@
 					"version": "8.0.1",
 					"resolved": "https://registry.npmjs.org/globby/-/globby-8.0.1.tgz",
 					"integrity": "sha512-oMrYrJERnKBLXNLVTqhm3vPEdJ/b2ZE28xN4YARiix1NOIOBPEpOUnm844K1iu/BkphCaf2WNFwMszv8Soi1pw==",
-					"dev": true,
 					"requires": {
 						"array-union": "^1.0.1",
 						"dir-glob": "^2.0.0",
@@ -16992,7 +15520,6 @@
 					"version": "5.2.0",
 					"resolved": "https://registry.npmjs.org/inquirer/-/inquirer-5.2.0.tgz",
 					"integrity": "sha512-E9BmnJbAKLPGonz0HeWHtbKf+EeSP93paWO3ZYoUpq/aowXvYGjjCSuashhXPpzbArIjBbji39THkxTz9ZeEUQ==",
-					"dev": true,
 					"requires": {
 						"ansi-escapes": "^3.0.0",
 						"chalk": "^2.0.0",
@@ -17012,14 +15539,12 @@
 				"lodash": {
 					"version": "4.17.10",
 					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz",
-					"integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==",
-					"dev": true
+					"integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg=="
 				},
 				"strip-ansi": {
 					"version": "4.0.0",
 					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
 					"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-					"dev": true,
 					"requires": {
 						"ansi-regex": "^3.0.0"
 					}
@@ -17030,7 +15555,6 @@
 			"version": "2.0.5",
 			"resolved": "https://registry.npmjs.org/yeoman-generator/-/yeoman-generator-2.0.5.tgz",
 			"integrity": "sha512-rV6tJ8oYzm4mmdF2T3wjY+Q42jKF2YiiD0VKfJ8/0ZYwmhCKC9Xs2346HVLPj/xE13i68psnFJv7iS6gWRkeAg==",
-			"dev": true,
 			"requires": {
 				"async": "^2.6.0",
 				"chalk": "^2.3.0",
@@ -17063,7 +15587,6 @@
 					"version": "2.6.0",
 					"resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz",
 					"integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==",
-					"dev": true,
 					"requires": {
 						"lodash": "^4.14.0"
 					}
@@ -17072,7 +15595,6 @@
 					"version": "6.0.5",
 					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
 					"integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-					"dev": true,
 					"requires": {
 						"nice-try": "^1.0.4",
 						"path-key": "^2.0.1",
@@ -17084,14 +15606,12 @@
 				"dargs": {
 					"version": "5.1.0",
 					"resolved": "https://registry.npmjs.org/dargs/-/dargs-5.1.0.tgz",
-					"integrity": "sha1-7H6lDHhWTNNsnV7Bj2Yyn63ieCk=",
-					"dev": true
+					"integrity": "sha1-7H6lDHhWTNNsnV7Bj2Yyn63ieCk="
 				},
 				"debug": {
 					"version": "3.1.0",
 					"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
 					"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-					"dev": true,
 					"requires": {
 						"ms": "2.0.0"
 					}
@@ -17099,20 +15619,17 @@
 				"lodash": {
 					"version": "4.17.10",
 					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz",
-					"integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==",
-					"dev": true
+					"integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg=="
 				},
 				"minimist": {
 					"version": "1.2.0",
 					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-					"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-					"dev": true
+					"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
 				},
 				"read-pkg-up": {
 					"version": "3.0.0",
 					"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz",
 					"integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=",
-					"dev": true,
 					"requires": {
 						"find-up": "^2.0.0",
 						"read-pkg": "^3.0.0"
diff --git a/package.json b/package.json
index 23d785f91b85d..e5ce0b3d7ef60 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "gutenberg",
-	"version": "3.0.1",
+	"version": "3.1.0",
 	"private": true,
 	"description": "A new WordPress editor experience",
 	"repository": "git+https://github.com/WordPress/gutenberg.git",
@@ -32,6 +32,7 @@
 		"escape-string-regexp": "1.0.5",
 		"eslint-plugin-wordpress": "git://github.com/WordPress-Coding-Standards/eslint-plugin-wordpress.git#1774343f6226052a46b081e01db3fca8793cc9f1",
 		"hpq": "1.2.0",
+		"http-build-query": "0.7.0",
 		"jquery": "3.3.1",
 		"js-beautify": "1.6.14",
 		"lerna": "2.11.0",
@@ -43,12 +44,12 @@
 		"prop-types": "15.5.10",
 		"querystringify": "1.0.0",
 		"re-resizable": "4.4.8",
-		"react": "16.3.2",
+		"react": "16.4.1",
 		"react-autosize-textarea": "3.0.2",
 		"react-click-outside": "2.3.1",
 		"react-color": "2.13.4",
 		"react-datepicker": "1.4.1",
-		"react-dom": "16.3.2",
+		"react-dom": "16.4.1",
 		"redux": "3.7.2",
 		"redux-multi": "0.1.12",
 		"redux-optimist": "1.0.0",
@@ -78,11 +79,13 @@
 		"core-js": "2.5.3",
 		"cross-env": "3.2.4",
 		"deep-freeze": "0.0.1",
+		"doctrine": "2.1.0",
 		"eslint": "4.16.0",
 		"eslint-config-wordpress": "2.0.0",
 		"eslint-plugin-jest": "21.5.0",
 		"eslint-plugin-jsx-a11y": "6.0.2",
 		"eslint-plugin-react": "7.7.0",
+		"espree": "3.5.4",
 		"extract-text-webpack-plugin": "4.0.0-beta.0",
 		"node-sass": "git://github.com/sass/node-sass.git#v4.7.0",
 		"pegjs": "0.10.0",
@@ -92,7 +95,7 @@
 		"postcss-loader": "2.1.3",
 		"puppeteer": "1.2.0",
 		"raw-loader": "0.5.1",
-		"react-test-renderer": "16.3.2",
+		"react-test-renderer": "16.4.1",
 		"sass-loader": "6.0.7",
 		"sprintf-js": "1.1.1",
 		"style-loader": "0.20.3",
@@ -147,6 +150,7 @@
 		"predev": "npm run check-engines",
 		"dev": "npm run build:packages && concurrently \"cross-env webpack --watch\" \"npm run dev:packages\"",
 		"dev:packages": "node ./bin/packages/watch.js",
+		"docs:generate-data-reference": "node docs/data/tool",
 		"fixtures:clean": "rimraf \"core-blocks/test/fixtures/*.+(json|serialized.html)\"",
 		"fixtures:server-registered": "docker-compose run -w /var/www/html/wp-content/plugins/gutenberg --rm wordpress ./bin/get-server-blocks.php > core-blocks/test/server-registered.json",
 		"fixtures:generate": "npm run fixtures:server-registered && cross-env GENERATE_MISSING_FIXTURES=y npm run test-unit",
@@ -169,6 +173,7 @@
 		"test-unit": "wp-scripts test-unit-js --config test/unit/jest.config.json",
 		"test-unit:coverage": "npm run test-unit -- --coverage",
 		"test-unit:coverage-ci": "npm run test-unit -- --coverage --maxWorkers 1 && codecov",
+		"test-unit:update": "npm run test-unit -- --updateSnapshot",
 		"test-unit:watch": "npm run test-unit -- --watch",
 		"test-unit-php": "docker-compose run --rm wordpress_phpunit phpunit",
 		"test-unit-php-multisite": "docker-compose run -e WP_MULTISITE=1 --rm wordpress_phpunit phpunit"
diff --git a/packages/api-request/README.md b/packages/api-request/README.md
index 220096dfe84fa..4c669acbb01f6 100644
--- a/packages/api-request/README.md
+++ b/packages/api-request/README.md
@@ -1,4 +1,4 @@
-# @wordpress/blob
+# @wordpress/api-request
 
 Wrapper around `jQuery.ajax` to call WordPress REST APIs.
 
diff --git a/packages/data/src/index.js b/packages/data/src/index.js
index 41cca7d50df14..14247b8bb601c 100644
--- a/packages/data/src/index.js
+++ b/packages/data/src/index.js
@@ -267,75 +267,61 @@ export function dispatch( reducerKey ) {
  * @return {Component} Enhanced component with merged state data props.
  */
 export const withSelect = ( mapStateToProps ) => createHigherOrderComponent( ( WrappedComponent ) => {
+	const DEFAULT_MERGE_PROPS = {};
+
 	return class ComponentWithSelect extends Component {
 		constructor() {
 			super( ...arguments );
 
-			this.runSelection = this.runSelection.bind( this );
-
-			/**
-			 * Boolean tracking known render conditions (own props or merged
-			 * props update) for `shouldComponentUpdate`.
-			 *
-			 * @type {boolean}
-			 */
-			this.shouldComponentUpdate = false;
+			this.subscribe();
 
 			this.state = {};
 		}
 
-		shouldComponentUpdate() {
-			return this.shouldComponentUpdate;
-		}
-
-		componentWillMount() {
-			this.subscribe();
+		static getDerivedStateFromProps( props ) {
+			// A constant value is used as the fallback since it can be more
+			// efficiently shallow compared in case component is repeatedly
+			// rendered without its own merge props.
+			const mergeProps = (
+				mapStateToProps( select, props ) ||
+				DEFAULT_MERGE_PROPS
+			);
 
-			// Populate initial state.
-			this.runSelection();
+			return { mergeProps };
 		}
 
-		componentWillReceiveProps( nextProps ) {
-			if ( ! isShallowEqual( nextProps, this.props ) ) {
-				this.runSelection( nextProps );
-				this.shouldComponentUpdate = true;
-			}
+		componentDidMount() {
+			this.canRunSelection = true;
 		}
 
 		componentWillUnmount() {
+			this.canRunSelection = false;
 			this.unsubscribe();
-
-			// While above unsubscribe avoids future listener calls, callbacks
-			// are snapshotted before being invoked, so if unmounting occurs
-			// during a previous callback, we need to explicitly track and
-			// avoid the `runSelection` that is scheduled to occur.
-			this.isUnmounting = true;
 		}
 
-		subscribe() {
-			this.unsubscribe = subscribe( this.runSelection );
+		shouldComponentUpdate( nextProps, nextState ) {
+			return (
+				! isShallowEqual( this.props, nextProps ) ||
+				! isShallowEqual( this.state.mergeProps, nextState.mergeProps )
+			);
 		}
 
-		runSelection( props = this.props ) {
-			if ( this.isUnmounting ) {
-				return;
-			}
-
-			const { mergeProps } = this.state;
-			const nextMergeProps = mapStateToProps( select, props ) || {};
-
-			if ( ! isShallowEqual( nextMergeProps, mergeProps ) ) {
-				this.setState( {
-					mergeProps: nextMergeProps,
-				} );
+		subscribe() {
+			this.unsubscribe = subscribe( () => {
+				if ( ! this.canRunSelection ) {
+					return;
+				}
 
-				this.shouldComponentUpdate = true;
-			}
+				// Trigger an update. Behavior of `getDerivedStateFromProps` as
+				// of React 16.4.0 is such that it will be called by any update
+				// to the component, including state changes.
+				//
+				// See: https://reactjs.org/blog/2018/05/23/react-v-16-4.html#bugfix-for-getderivedstatefromprops
+				this.setState( () => ( {} ) );
+			} );
 		}
 
 		render() {
-			this.shouldComponentUpdate = false;
-
 			return <WrappedComponent { ...this.props } { ...this.state.mergeProps } />;
 		}
 	};
@@ -358,20 +344,17 @@ export const withDispatch = ( mapDispatchToProps ) => createHigherOrderComponent
 		pure,
 		( WrappedComponent ) => {
 			return class ComponentWithDispatch extends Component {
-				constructor() {
+				constructor( props ) {
 					super( ...arguments );
 
 					this.proxyProps = {};
+					this.setProxyProps( props );
 				}
 
-				componentWillMount() {
+				componentDidUpdate() {
 					this.setProxyProps( this.props );
 				}
 
-				componentWillUpdate( nextProps ) {
-					this.setProxyProps( nextProps );
-				}
-
 				proxyDispatch( propName, ...args ) {
 					// Original dispatcher is a pre-bound (dispatching) action creator.
 					mapDispatchToProps( dispatch, this.props )[ propName ]( ...args );
diff --git a/packages/data/src/test/index.js b/packages/data/src/test/index.js
index 078810013d8dc..816b3914dc5e5 100644
--- a/packages/data/src/test/index.js
+++ b/packages/data/src/test/index.js
@@ -394,25 +394,13 @@ describe( 'select', () => {
 describe( 'withSelect', () => {
 	let wrapper, store;
 
-	const unsubscribes = [];
 	afterEach( () => {
-		let unsubscribe;
-		while ( ( unsubscribe = unsubscribes.shift() ) ) {
-			unsubscribe();
-		}
-
 		if ( wrapper ) {
 			wrapper.unmount();
 			wrapper = null;
 		}
 	} );
 
-	function subscribeWithUnsubscribe( ...args ) {
-		const unsubscribe = store.subscribe( ...args );
-		unsubscribes.push( unsubscribe );
-		return unsubscribe;
-	}
-
 	it( 'passes the relevant data to the component', () => {
 		registerReducer( 'reactReducer', () => ( { reactKey: 'reactState' } ) );
 		registerSelectors( 'reactReducer', {
@@ -426,12 +414,21 @@ describe( 'withSelect', () => {
 		// including both `withSelect` and `select` in the same scope, which
 		// shouldn't occur for a typical component, and if it did might wrongly
 		// encourage the developer to use `select` within the component itself.
-		const Component = withSelect( ( _select, ownProps ) => ( {
+		const mapSelectToProps = jest.fn().mockImplementation( ( _select, ownProps ) => ( {
 			data: _select( 'reactReducer' ).reactSelector( ownProps.keyName ),
-		} ) )( ( props ) => <div>{ props.data }</div> );
+		} ) );
+
+		const OriginalComponent = jest.fn().mockImplementation( ( props ) => (
+			<div>{ props.data }</div>
+		) );
+
+		const Component = withSelect( mapSelectToProps )( OriginalComponent );
 
 		wrapper = mount( <Component keyName="reactKey" /> );
 
+		expect( mapSelectToProps ).toHaveBeenCalledTimes( 1 );
+		expect( OriginalComponent ).toHaveBeenCalledTimes( 1 );
+
 		// Wrapper is the enhanced component. Find props on the rendered child.
 		const child = wrapper.childAt( 0 );
 		expect( child.props() ).toEqual( {
@@ -458,26 +455,43 @@ describe( 'withSelect', () => {
 			increment: () => ( { type: 'increment' } ),
 		} );
 
-		const Component = compose( [
-			withSelect( ( _select ) => ( {
-				count: _select( 'counter' ).getCount(),
-			} ) ),
-			withDispatch( ( _dispatch ) => ( {
-				increment: _dispatch( 'counter' ).increment,
-			} ) ),
-		] )( ( props ) => (
+		const mapSelectToProps = jest.fn().mockImplementation( ( _select ) => ( {
+			count: _select( 'counter' ).getCount(),
+		} ) );
+
+		const mapDispatchToProps = jest.fn().mockImplementation( ( _dispatch ) => ( {
+			increment: _dispatch( 'counter' ).increment,
+		} ) );
+
+		const OriginalComponent = jest.fn().mockImplementation( ( props ) => (
 			<button onClick={ props.increment }>
 				{ props.count }
 			</button>
 		) );
 
+		const Component = compose( [
+			withSelect( mapSelectToProps ),
+			withDispatch( mapDispatchToProps ),
+		] )( OriginalComponent );
+
 		wrapper = mount( <Component /> );
 
+		expect( OriginalComponent ).toHaveBeenCalledTimes( 1 );
+		expect( mapSelectToProps ).toHaveBeenCalledTimes( 1 );
+		expect( mapDispatchToProps ).toHaveBeenCalledTimes( 1 );
+
 		const button = wrapper.find( 'button' );
 
 		button.simulate( 'click' );
 
 		expect( button.text() ).toBe( '1' );
+		// 3 times =
+		//  1. Initial mount
+		//  2. When click handler is called
+		//  3. After select updates its merge props
+		expect( mapDispatchToProps ).toHaveBeenCalledTimes( 3 );
+		expect( mapSelectToProps ).toHaveBeenCalledTimes( 2 );
+		expect( OriginalComponent ).toHaveBeenCalledTimes( 2 );
 	} );
 
 	it( 'should rerun selection on props changes', () => {
@@ -493,45 +507,52 @@ describe( 'withSelect', () => {
 			getCount: ( state, offset ) => state + offset,
 		} );
 
-		const Component = withSelect( ( _select, ownProps ) => ( {
+		const mapSelectToProps = jest.fn().mockImplementation( ( _select, ownProps ) => ( {
 			count: _select( 'counter' ).getCount( ownProps.offset ),
-		} ) )( ( props ) => <div>{ props.count }</div> );
+		} ) );
+
+		const OriginalComponent = jest.fn().mockImplementation( ( props ) => (
+			<div>{ props.count }</div>
+		) );
+
+		const Component = withSelect( mapSelectToProps )( OriginalComponent );
 
 		wrapper = mount( <Component offset={ 0 } /> );
 
+		expect( mapSelectToProps ).toHaveBeenCalledTimes( 1 );
+		expect( OriginalComponent ).toHaveBeenCalledTimes( 1 );
+
 		wrapper.setProps( { offset: 10 } );
 
 		expect( wrapper.childAt( 0 ).text() ).toBe( '10' );
+		expect( mapSelectToProps ).toHaveBeenCalledTimes( 2 );
+		expect( OriginalComponent ).toHaveBeenCalledTimes( 2 );
 	} );
 
-	it( 'ensures component is still mounted before setting state', () => {
-		// This test verifies that even though unsubscribe doesn't take effect
-		// until after the current listener stack is called, we don't attempt
-		// to setState on an unmounting `withSelect` component. It will fail if
-		// an attempt is made to `setState` on an unmounted component.
-		store = registerReducer( 'counter', ( state = 0, action ) => {
-			if ( action.type === 'increment' ) {
-				return state + 1;
-			}
+	it( 'should render if props have changed but not state', () => {
+		store = registerReducer( 'unchanging', ( state = {} ) => state );
 
-			return state;
+		registerSelectors( 'unchanging', {
+			getState: ( state ) => state,
 		} );
 
-		registerSelectors( 'counter', {
-			getCount: ( state, offset ) => state + offset,
-		} );
+		const mapSelectToProps = jest.fn();
 
-		subscribeWithUnsubscribe( () => {
-			wrapper.unmount();
-		} );
+		const OriginalComponent = jest.fn().mockImplementation( () => <div /> );
 
-		const Component = withSelect( ( _select, ownProps ) => ( {
-			count: _select( 'counter' ).getCount( ownProps.offset ),
-		} ) )( ( props ) => <div>{ props.count }</div> );
+		const Component = compose( [
+			withSelect( mapSelectToProps ),
+		] )( OriginalComponent );
 
-		wrapper = mount( <Component offset={ 0 } /> );
+		wrapper = mount( <Component /> );
 
-		store.dispatch( { type: 'increment' } );
+		expect( mapSelectToProps ).toHaveBeenCalledTimes( 1 );
+		expect( OriginalComponent ).toHaveBeenCalledTimes( 1 );
+
+		wrapper.setProps( { propName: 'foo' } );
+
+		expect( mapSelectToProps ).toHaveBeenCalledTimes( 2 );
+		expect( OriginalComponent ).toHaveBeenCalledTimes( 2 );
 	} );
 
 	it( 'should not rerun selection on unchanging state', () => {
@@ -543,15 +564,21 @@ describe( 'withSelect', () => {
 
 		const mapSelectToProps = jest.fn();
 
+		const OriginalComponent = jest.fn().mockImplementation( () => <div /> );
+
 		const Component = compose( [
 			withSelect( mapSelectToProps ),
-		] )( () => <div /> );
+		] )( OriginalComponent );
 
 		wrapper = mount( <Component /> );
 
+		expect( mapSelectToProps ).toHaveBeenCalledTimes( 1 );
+		expect( OriginalComponent ).toHaveBeenCalledTimes( 1 );
+
 		store.dispatch( { type: 'dummy' } );
 
 		expect( mapSelectToProps ).toHaveBeenCalledTimes( 1 );
+		expect( OriginalComponent ).toHaveBeenCalledTimes( 1 );
 	} );
 
 	it( 'omits props which are not returned on subsequent mappings', () => {
@@ -560,18 +587,26 @@ describe( 'withSelect', () => {
 			getValue: ( state ) => state,
 		} );
 
-		const Component = withSelect( ( _select, ownProps ) => {
+		const mapSelectToProps = jest.fn().mockImplementation( ( _select, ownProps ) => {
 			return {
 				[ ownProps.propName ]: _select( 'demo' ).getValue(),
 			};
-		} )( () => <div /> );
+		} );
+
+		const OriginalComponent = jest.fn().mockImplementation( () => <div /> );
+
+		const Component = withSelect( mapSelectToProps )( OriginalComponent );
 
 		wrapper = mount( <Component propName="foo" /> );
 
+		expect( mapSelectToProps ).toHaveBeenCalledTimes( 1 );
+		expect( OriginalComponent ).toHaveBeenCalledTimes( 1 );
 		expect( wrapper.childAt( 0 ).props() ).toEqual( { foo: 'OK', propName: 'foo' } );
 
 		wrapper.setProps( { propName: 'bar' } );
 
+		expect( mapSelectToProps ).toHaveBeenCalledTimes( 2 );
+		expect( OriginalComponent ).toHaveBeenCalledTimes( 2 );
 		expect( wrapper.childAt( 0 ).props() ).toEqual( { bar: 'OK', propName: 'bar' } );
 	} );
 
@@ -581,26 +616,77 @@ describe( 'withSelect', () => {
 			getValue: ( state ) => state,
 		} );
 
-		const Component = withSelect( ( _select, ownProps ) => {
+		const mapSelectToProps = jest.fn().mockImplementation( ( _select, ownProps ) => {
 			if ( ownProps.pass ) {
 				return {
 					count: _select( 'demo' ).getValue(),
 				};
 			}
-		} )( ( props ) => <div>{ props.count || 'Unknown' }</div> );
+		} );
+
+		const OriginalComponent = jest.fn().mockImplementation( (
+			( props ) => <div>{ props.count || 'Unknown' }</div>
+		) );
+
+		const Component = withSelect( mapSelectToProps )( OriginalComponent );
 
 		wrapper = mount( <Component pass={ false } /> );
 
+		expect( mapSelectToProps ).toHaveBeenCalledTimes( 1 );
+		expect( OriginalComponent ).toHaveBeenCalledTimes( 1 );
 		expect( wrapper.childAt( 0 ).text() ).toBe( 'Unknown' );
 
 		wrapper.setProps( { pass: true } );
 
+		expect( mapSelectToProps ).toHaveBeenCalledTimes( 2 );
+		expect( OriginalComponent ).toHaveBeenCalledTimes( 2 );
 		expect( wrapper.childAt( 0 ).text() ).toBe( 'OK' );
 
 		wrapper.setProps( { pass: false } );
 
+		expect( mapSelectToProps ).toHaveBeenCalledTimes( 3 );
+		expect( OriginalComponent ).toHaveBeenCalledTimes( 3 );
 		expect( wrapper.childAt( 0 ).text() ).toBe( 'Unknown' );
 	} );
+
+	it( 'should run selections on parents before its children', () => {
+		registerReducer( 'childRender', ( state = true, action ) => (
+			action.type === 'TOGGLE_RENDER' ? ! state : state
+		) );
+		registerSelectors( 'childRender', {
+			getValue: ( state ) => state,
+		} );
+		registerActions( 'childRender', {
+			toggleRender: () => ( { type: 'TOGGLE_RENDER' } ),
+		} );
+
+		const childMapStateToProps = jest.fn();
+		const parentMapStateToProps = jest.fn().mockImplementation( ( _select ) => ( {
+			isRenderingChild: _select( 'childRender' ).getValue(),
+		} ) );
+
+		const ChildOriginalComponent = jest.fn().mockImplementation( () => <div /> );
+		const ParentOriginalComponent = jest.fn().mockImplementation( ( props ) => (
+			<div>{ props.isRenderingChild ? <Child /> : null }</div>
+		) );
+
+		const Child = withSelect( childMapStateToProps )( ChildOriginalComponent );
+		const Parent = withSelect( parentMapStateToProps )( ParentOriginalComponent );
+
+		wrapper = mount( <Parent /> );
+
+		expect( childMapStateToProps ).toHaveBeenCalledTimes( 1 );
+		expect( parentMapStateToProps ).toHaveBeenCalledTimes( 1 );
+		expect( ChildOriginalComponent ).toHaveBeenCalledTimes( 1 );
+		expect( ParentOriginalComponent ).toHaveBeenCalledTimes( 1 );
+
+		dispatch( 'childRender' ).toggleRender();
+
+		expect( childMapStateToProps ).toHaveBeenCalledTimes( 1 );
+		expect( parentMapStateToProps ).toHaveBeenCalledTimes( 2 );
+		expect( ChildOriginalComponent ).toHaveBeenCalledTimes( 1 );
+		expect( ParentOriginalComponent ).toHaveBeenCalledTimes( 2 );
+	} );
 } );
 
 describe( 'withDispatch', () => {
diff --git a/packages/element/package.json b/packages/element/package.json
index ad8a531b82a95..5240cb7c3527f 100644
--- a/packages/element/package.json
+++ b/packages/element/package.json
@@ -20,10 +20,11 @@
 	"main": "build/index.js",
 	"module": "build-module/index.js",
 	"dependencies": {
+		"@wordpress/deprecated": "^1.0.0-alpha.1",
 		"@wordpress/is-shallow-equal": "1.0.2",
 		"lodash": "4.17.5",
-		"react": "16.3.2",
-		"react-dom": "16.3.2"
+		"react": "16.4.1",
+		"react-dom": "16.4.1"
 	},
 	"devDependencies": {
 		"enzyme": "3.3.0"
diff --git a/packages/element/src/serialize.js b/packages/element/src/serialize.js
index 6ef93817d8c93..45c5b91da8958 100644
--- a/packages/element/src/serialize.js
+++ b/packages/element/src/serialize.js
@@ -28,7 +28,12 @@
 /**
  * External dependencies
  */
-import { isEmpty, castArray, omit, kebabCase } from 'lodash';
+import { flowRight, isEmpty, castArray, omit, kebabCase } from 'lodash';
+
+/**
+ * WordPress dependencies
+ */
+import deprecated from '@wordpress/deprecated';
 
 /**
  * Internal dependencies
@@ -219,6 +224,46 @@ const CSS_PROPERTIES_SUPPORTS_UNITLESS = new Set( [
 	'zoom',
 ] );
 
+/**
+ * Returns a string with ampersands escaped. Note that this is an imperfect
+ * implementation, where only ampersands which do not appear as a pattern of
+ * named, decimal, or hexadecimal character references are escaped. Invalid
+ * named references (i.e. ambiguous ampersand) are are still permitted.
+ *
+ * @link https://w3c.github.io/html/syntax.html#character-references
+ * @link https://w3c.github.io/html/syntax.html#ambiguous-ampersand
+ * @link https://w3c.github.io/html/syntax.html#named-character-references
+ *
+ * @param {string} value Original string.
+ *
+ * @return {string} Escaped string.
+ */
+export function escapeAmpersand( value ) {
+	return value.replace( /&(?!([a-z0-9]+|#[0-9]+|#x[a-f0-9]+);)/gi, '&amp;' );
+}
+
+/**
+ * Returns a string with quotation marks replaced.
+ *
+ * @param {string} value Original string.
+ *
+ * @return {string} Escaped string.
+ */
+export function escapeQuotationMark( value ) {
+	return value.replace( /"/g, '&quot;' );
+}
+
+/**
+ * Returns a string with less-than sign replaced.
+ *
+ * @param {string} value Original string.
+ *
+ * @return {string} Escaped string.
+ */
+export function escapeLessThan( value ) {
+	return value.replace( /</g, '&lt;' );
+}
+
 /**
  * Returns an escaped attribute value.
  *
@@ -231,15 +276,15 @@ const CSS_PROPERTIES_SUPPORTS_UNITLESS = new Set( [
  *
  * @return {string} Escaped attribute value.
  */
-function escapeAttribute( value ) {
-	return value.replace( /&/g, '&amp;' ).replace( /"/g, '&quot;' );
-}
+export const escapeAttribute = flowRight( [
+	escapeAmpersand,
+	escapeQuotationMark,
+] );
 
 /**
  * Returns an escaped HTML element value.
  *
  * @link https://w3c.github.io/html/syntax.html#writing-html-documents-elements
- * @link https://w3c.github.io/html/syntax.html#ambiguous-ampersand
  *
  * "the text must not contain the character U+003C LESS-THAN SIGN (<) or an
  * ambiguous ampersand."
@@ -248,9 +293,10 @@ function escapeAttribute( value ) {
  *
  * @return {string} Escaped HTML element value.
  */
-function escapeHTML( value ) {
-	return value.replace( /&/g, '&amp;' ).replace( /</g, '&lt;' );
-}
+export const escapeHTML = flowRight( [
+	escapeAmpersand,
+	escapeLessThan,
+] );
 
 /**
  * Returns true if the specified string is prefixed by one of an array of
@@ -443,6 +489,11 @@ export function renderComponent( Component, props, context = {} ) {
 
 	if ( typeof instance.componentWillMount === 'function' ) {
 		instance.componentWillMount();
+		deprecated( 'componentWillMount', {
+			version: '3.3',
+			alternative: 'the constructor',
+			plugin: 'Gutenberg',
+		} );
 	}
 
 	if ( typeof instance.getChildContext === 'function' ) {
diff --git a/packages/element/src/test/serialize.js b/packages/element/src/test/serialize.js
index 134371161ec57..2408c75e7b27f 100644
--- a/packages/element/src/test/serialize.js
+++ b/packages/element/src/test/serialize.js
@@ -13,6 +13,11 @@ import {
 	RawHTML,
 } from '../';
 import serialize, {
+	escapeAmpersand,
+	escapeQuotationMark,
+	escapeLessThan,
+	escapeAttribute,
+	escapeHTML,
 	hasPrefix,
 	renderElement,
 	renderNativeComponent,
@@ -21,6 +26,52 @@ import serialize, {
 	renderStyle,
 } from '../serialize';
 
+function testEscapeAmpersand( implementation ) {
+	it( 'should escape ampersand', () => {
+		const result = implementation( 'foo & bar &amp; &AMP; baz &#931; &#bad; &#x3A3; &#X3a3; &#xevil;' );
+
+		expect( result ).toBe( 'foo &amp; bar &amp; &AMP; baz &#931; &amp;#bad; &#x3A3; &#X3a3; &amp;#xevil;' );
+	} );
+}
+
+function testEscapeQuotationMark( implementation ) {
+	it( 'should escape quotation mark', () => {
+		const result = implementation( '"Be gone!"' );
+
+		expect( result ).toBe( '&quot;Be gone!&quot;' );
+	} );
+}
+
+function testEscapeLessThan( implementation ) {
+	it( 'should escape less than', () => {
+		const result = implementation( 'Chicken < Ribs' );
+
+		expect( result ).toBe( 'Chicken &lt; Ribs' );
+	} );
+}
+
+describe( 'escapeAmpersand', () => {
+	testEscapeAmpersand( escapeAmpersand );
+} );
+
+describe( 'escapeQuotationMark', () => {
+	testEscapeQuotationMark( escapeQuotationMark );
+} );
+
+describe( 'escapeLessThan', () => {
+	testEscapeLessThan( escapeLessThan );
+} );
+
+describe( 'escapeAttribute', () => {
+	testEscapeAmpersand( escapeAttribute );
+	testEscapeQuotationMark( escapeAttribute );
+} );
+
+describe( 'escapeHTML', () => {
+	testEscapeAmpersand( escapeHTML );
+	testEscapeLessThan( escapeHTML );
+} );
+
 describe( 'serialize()', () => {
 	it( 'should render with context', () => {
 		class Provider extends Component {
@@ -155,7 +206,7 @@ describe( 'renderElement()', () => {
 	it( 'renders escaped string element', () => {
 		const result = renderElement( 'hello & world &amp; friends <img/>' );
 
-		expect( result ).toBe( 'hello &amp; world &amp;amp; friends &lt;img/>' );
+		expect( result ).toBe( 'hello &amp; world &amp; friends &lt;img/>' );
 	} );
 
 	it( 'renders numeric element as string', () => {
@@ -322,6 +373,7 @@ describe( 'renderComponent()', () => {
 
 		const result = renderComponent( Example, {} );
 
+		expect( console ).toHaveWarned();
 		expect( result ).toBe( 'constructedwillMounted' );
 	} );
 
diff --git a/packages/plugins/.npmrc b/packages/plugins/.npmrc
new file mode 100644
index 0000000000000..43c97e719a5a8
--- /dev/null
+++ b/packages/plugins/.npmrc
@@ -0,0 +1 @@
+package-lock=false
diff --git a/plugins/README.md b/packages/plugins/README.md
similarity index 95%
rename from plugins/README.md
rename to packages/plugins/README.md
index 8bbbd146c865a..f52a26793d269 100644
--- a/plugins/README.md
+++ b/packages/plugins/README.md
@@ -1,4 +1,14 @@
-# Plugins
+# @wordpress/plugins
+
+Plugins module for WordPress.
+
+## Installation
+
+Install the module
+
+```bash
+npm install @wordpress/plugins --save
+```
 
 ### Plugins API
 
diff --git a/packages/plugins/package.json b/packages/plugins/package.json
new file mode 100644
index 0000000000000..12f797c91a025
--- /dev/null
+++ b/packages/plugins/package.json
@@ -0,0 +1,29 @@
+{
+	"name": "@wordpress/plugins",
+	"version": "1.0.0-alpha.1",
+	"description": "Plugins module for WordPress",
+	"author": "The WordPress Contributors",
+	"license": "GPL-2.0-or-later",
+	"keywords": [
+		"wordpress",
+		"plugins"
+	],
+	"homepage": "https://github.com/WordPress/gutenberg/tree/master/packages/plugins/README.md",
+	"repository": {
+		"type": "git",
+		"url": "https://github.com/WordPress/gutenberg.git"
+	},
+	"bugs": {
+		"url": "https://github.com/WordPress/gutenberg/issues"
+	},
+	"main": "build/index.js",
+	"module": "build-module/index.js",
+	"dependencies": {
+		"@wordpress/element": "^1.0.0-alpha.1",
+		"@wordpress/hooks": "1.1.6",
+		"lodash": "4.17.5"
+	},
+	"publishConfig": {
+		"access": "public"
+	}
+}
diff --git a/plugins/api/index.js b/packages/plugins/src/api/index.js
similarity index 100%
rename from plugins/api/index.js
rename to packages/plugins/src/api/index.js
diff --git a/plugins/api/test/index.js b/packages/plugins/src/api/test/index.js
similarity index 100%
rename from plugins/api/test/index.js
rename to packages/plugins/src/api/test/index.js
diff --git a/plugins/components/index.js b/packages/plugins/src/components/index.js
similarity index 100%
rename from plugins/components/index.js
rename to packages/plugins/src/components/index.js
diff --git a/plugins/components/plugin-area/index.js b/packages/plugins/src/components/plugin-area/index.js
similarity index 96%
rename from plugins/components/plugin-area/index.js
rename to packages/plugins/src/components/plugin-area/index.js
index 4bfd74176991f..1beeccc5317de 100644
--- a/plugins/components/plugin-area/index.js
+++ b/packages/plugins/src/components/plugin-area/index.js
@@ -6,7 +6,7 @@ import { map } from 'lodash';
 /**
  * WordPress dependencies
  */
-import { Component } from '@wordpress/element';
+import { Component, createElement } from '@wordpress/element';
 import { addAction, removeAction } from '@wordpress/hooks';
 
 /**
diff --git a/plugins/components/plugin-context/index.js b/packages/plugins/src/components/plugin-context/index.js
similarity index 90%
rename from plugins/components/plugin-context/index.js
rename to packages/plugins/src/components/plugin-context/index.js
index 3bf3030780bc7..f640dd0b66f18 100644
--- a/plugins/components/plugin-context/index.js
+++ b/packages/plugins/src/components/plugin-context/index.js
@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { createContext, createHigherOrderComponent } from '@wordpress/element';
+import { createContext, createHigherOrderComponent, createElement } from '@wordpress/element';
 
 const { Consumer, Provider } = createContext( {
 	name: null,
diff --git a/plugins/index.js b/packages/plugins/src/index.js
similarity index 100%
rename from plugins/index.js
rename to packages/plugins/src/index.js
diff --git a/phpunit/class-gutenberg-rest-api-test.php b/phpunit/class-gutenberg-rest-api-test.php
index 54656a4811f29..e8fcb33d558e8 100644
--- a/phpunit/class-gutenberg-rest-api-test.php
+++ b/phpunit/class-gutenberg-rest-api-test.php
@@ -415,18 +415,26 @@ public function test_get_pages_unbounded_per_page_unauthorized() {
 		$this->assertEquals( 'rest_forbidden_per_page', $data['code'] );
 	}
 
-	public function test_get_page_edit_context_includes_preview() {
-		wp_set_current_user( $this->editor );
-		$page_id = $this->factory->post->create( array(
-			'post_type'   => 'page',
-			'post_status' => 'draft',
-		) );
-		$page    = get_post( $page_id );
-		$request = new WP_REST_Request( 'GET', '/wp/v2/pages/' . $page_id );
-		$request->set_param( 'context', 'edit' );
+	public function test_get_post_links_predecessor_version() {
+		$post_id = $this->factory->post->create();
+		wp_update_post(
+			array(
+				'post_content' => 'This content is marvelous.',
+				'ID'           => $post_id,
+			)
+		);
+		$revisions  = wp_get_post_revisions( $post_id );
+		$revision_1 = array_pop( $revisions );
+
+		$request  = new WP_REST_Request( 'GET', sprintf( '/wp/v2/posts/%d', $post_id ) );
 		$response = rest_get_server()->dispatch( $request );
-		$this->assertEquals( 200, $response->get_status() );
-		$data = $response->get_data();
-		$this->assertEquals( get_preview_post_link( $page ), $data['preview_link'] );
+
+		$links = $response->get_links();
+
+		$this->assertEquals( rest_url( '/wp/v2/posts/' . $post_id . '/revisions' ), $links['version-history'][0]['href'] );
+		$this->assertEquals( 1, $links['version-history'][0]['attributes']['count'] );
+
+		$this->assertEquals( rest_url( '/wp/v2/posts/' . $post_id . '/revisions/' . $revision_1->ID ), $links['predecessor-version'][0]['href'] );
+		$this->assertEquals( $revision_1->ID, $links['predecessor-version'][0]['attributes']['id'] );
 	}
 }
diff --git a/phpunit/class-rest-autosaves-controller-test.php b/phpunit/class-rest-autosaves-controller-test.php
index 20f61f1d2ede4..2acc91295070c 100644
--- a/phpunit/class-rest-autosaves-controller-test.php
+++ b/phpunit/class-rest-autosaves-controller-test.php
@@ -239,7 +239,7 @@ public function test_get_item_schema() {
 		$response   = rest_get_server()->dispatch( $request );
 		$data       = $response->get_data();
 		$properties = $data['schema']['properties'];
-		$this->assertEquals( 12, count( $properties ) );
+		$this->assertEquals( 13, count( $properties ) );
 		$this->assertArrayHasKey( 'author', $properties );
 		$this->assertArrayHasKey( 'content', $properties );
 		$this->assertArrayHasKey( 'date', $properties );
@@ -252,6 +252,7 @@ public function test_get_item_schema() {
 		$this->assertArrayHasKey( 'parent', $properties );
 		$this->assertArrayHasKey( 'slug', $properties );
 		$this->assertArrayHasKey( 'title', $properties );
+		$this->assertArrayHasKey( 'preview_link', $properties );
 	}
 
 	public function test_create_item() {
diff --git a/phpunit/class-vendor-script-filename-test.php b/phpunit/class-vendor-script-filename-test.php
index e71b56a46c432..352395e3bf9b1 100644
--- a/phpunit/class-vendor-script-filename-test.php
+++ b/phpunit/class-vendor-script-filename-test.php
@@ -10,11 +10,11 @@ function vendor_script_filename_cases() {
 		return array(
 			// Development mode scripts.
 			array(
-				'https://unpkg.com/react@16.3.2/umd/react.development.js',
+				'https://unpkg.com/react@16.4.1/umd/react.development.js',
 				'react.HASH.js',
 			),
 			array(
-				'https://unpkg.com/react-dom@16.3.2/umd/react-dom.development.js',
+				'https://unpkg.com/react-dom@16.4.1/umd/react-dom.development.js',
 				'react-dom.HASH.js',
 			),
 			array(
@@ -27,11 +27,11 @@ function vendor_script_filename_cases() {
 			),
 			// Production mode scripts.
 			array(
-				'https://unpkg.com/react@16.3.2/umd/react.production.min.js',
+				'https://unpkg.com/react@16.4.1/umd/react.production.min.js',
 				'react.min.HASH.js',
 			),
 			array(
-				'https://unpkg.com/react-dom@16.3.2/umd/react-dom.production.min.js',
+				'https://unpkg.com/react-dom@16.4.1/umd/react-dom.production.min.js',
 				'react-dom.min.HASH.js',
 			),
 			array(
diff --git a/post-content.js b/post-content.js
index ac2c915cb23be..a6ca6923e9ca5 100644
--- a/post-content.js
+++ b/post-content.js
@@ -124,9 +124,9 @@ window._wpGutenbergDefaultPost = {
 			'<p>Any block can opt into these alignments. The embed block has them also, and is responsive out of the box:</p>',
 			'<!-- /wp:paragraph -->',
 
-			'<!-- wp:embed {"url":"https://vimeo.com/22439234","align":"wide","type":"video","providerNameSlug":"vimeo"} -->',
-			'<figure class="wp-block-embed alignwide is-type-video is-provider-vimeo">https://vimeo.com/22439234</figure>',
-			'<!-- /wp:embed -->',
+			'<!-- wp:core-embed/vimeo {"url":"https://vimeo.com/22439234","align":"wide","type":"video","providerNameSlug":"vimeo"} -->',
+			'<figure class="wp-block-embed-vimeo wp-block-embed alignwide is-type-video is-provider-vimeo">https://vimeo.com/22439234</figure>',
+			'<!-- /wp:core-embed/vimeo -->',
 
 			'<!-- wp:paragraph -->',
 			'<p>You can build any block you like, static or dynamic, decorative or plain. Here\'s a pullquote block:</p>',
diff --git a/test/e2e/specs/__snapshots__/plugins-api.test.js.snap b/test/e2e/specs/__snapshots__/plugins-api.test.js.snap
index e0960eee29dd7..7878c01caa0c3 100644
--- a/test/e2e/specs/__snapshots__/plugins-api.test.js.snap
+++ b/test/e2e/specs/__snapshots__/plugins-api.test.js.snap
@@ -1,3 +1,3 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Using Plugins API Should open plugins sidebar using More Menu item and render content 1`] = `"<div class=\\"components-panel__header edit-post-sidebar-header__small\\"><span class=\\"edit-post-sidebar-header__title\\">(no title)</span><button type=\\"button\\" aria-label=\\"Close plugin\\" class=\\"components-button components-icon-button\\"><svg aria-hidden=\\"true\\" role=\\"img\\" focusable=\\"false\\" class=\\"dashicon dashicons-no-alt\\" xmlns=\\"http://www.w3.org/2000/svg\\" width=\\"20\\" height=\\"20\\" viewBox=\\"0 0 20 20\\"><path d=\\"M14.95 6.46L11.41 10l3.54 3.54-1.41 1.41L10 11.42l-3.53 3.53-1.42-1.42L8.58 10 5.05 6.47l1.42-1.42L10 8.58l3.54-3.53z\\"></path></svg></button></div><div class=\\"components-panel__header edit-post-sidebar-header\\"><strong>My title plugin</strong><button type=\\"button\\" aria-expanded=\\"true\\" aria-label=\\"Unpin from toolbar\\" class=\\"components-button components-icon-button is-toggled\\"><svg aria-hidden=\\"true\\" role=\\"img\\" focusable=\\"false\\" class=\\"dashicon dashicons-star-filled\\" xmlns=\\"http://www.w3.org/2000/svg\\" width=\\"20\\" height=\\"20\\" viewBox=\\"0 0 20 20\\"><path d=\\"M10 1l3 6 6 .75-4.12 4.62L16 19l-6-3-6 3 1.13-6.63L1 7.75 7 7z\\"></path></svg></button><button type=\\"button\\" aria-label=\\"Close plugin\\" class=\\"components-button components-icon-button\\"><svg aria-hidden=\\"true\\" role=\\"img\\" focusable=\\"false\\" class=\\"dashicon dashicons-no-alt\\" xmlns=\\"http://www.w3.org/2000/svg\\" width=\\"20\\" height=\\"20\\" viewBox=\\"0 0 20 20\\"><path d=\\"M14.95 6.46L11.41 10l3.54 3.54-1.41 1.41L10 11.42l-3.53 3.53-1.42-1.42L8.58 10 5.05 6.47l1.42-1.42L10 8.58l3.54-3.53z\\"></path></svg></button></div><div class=\\"components-panel\\"><div class=\\"components-panel__body is-opened\\"><div class=\\"components-panel__row\\"><em>(No title)</em></div><div class=\\"components-panel__row\\"><button type=\\"button\\" class=\\"components-button is-button is-primary\\">Reset</button></div></div></div>"`;
+exports[`Using Plugins API Sidebar Should open plugins sidebar using More Menu item and render content 1`] = `"<div class=\\"components-panel__header edit-post-sidebar-header__small\\"><span class=\\"edit-post-sidebar-header__title\\">(no title)</span><button type=\\"button\\" aria-label=\\"Close plugin\\" class=\\"components-button components-icon-button\\"><svg aria-hidden=\\"true\\" role=\\"img\\" focusable=\\"false\\" class=\\"dashicon dashicons-no-alt\\" xmlns=\\"http://www.w3.org/2000/svg\\" width=\\"20\\" height=\\"20\\" viewBox=\\"0 0 20 20\\"><path d=\\"M14.95 6.46L11.41 10l3.54 3.54-1.41 1.41L10 11.42l-3.53 3.53-1.42-1.42L8.58 10 5.05 6.47l1.42-1.42L10 8.58l3.54-3.53z\\"></path></svg></button></div><div class=\\"components-panel__header edit-post-sidebar-header\\"><strong>Sidebar title plugin</strong><button type=\\"button\\" aria-expanded=\\"true\\" aria-label=\\"Unpin from toolbar\\" class=\\"components-button components-icon-button is-toggled\\"><svg aria-hidden=\\"true\\" role=\\"img\\" focusable=\\"false\\" class=\\"dashicon dashicons-star-filled\\" xmlns=\\"http://www.w3.org/2000/svg\\" width=\\"20\\" height=\\"20\\" viewBox=\\"0 0 20 20\\"><path d=\\"M10 1l3 6 6 .75-4.12 4.62L16 19l-6-3-6 3 1.13-6.63L1 7.75 7 7z\\"></path></svg></button><button type=\\"button\\" aria-label=\\"Close plugin\\" class=\\"components-button components-icon-button\\"><svg aria-hidden=\\"true\\" role=\\"img\\" focusable=\\"false\\" class=\\"dashicon dashicons-no-alt\\" xmlns=\\"http://www.w3.org/2000/svg\\" width=\\"20\\" height=\\"20\\" viewBox=\\"0 0 20 20\\"><path d=\\"M14.95 6.46L11.41 10l3.54 3.54-1.41 1.41L10 11.42l-3.53 3.53-1.42-1.42L8.58 10 5.05 6.47l1.42-1.42L10 8.58l3.54-3.53z\\"></path></svg></button></div><div class=\\"components-panel\\"><div class=\\"components-panel__body is-opened\\"><div class=\\"components-panel__row\\"><label for=\\"title-plain-text\\">Title:</label><textarea class=\\"editor-plain-text\\" id=\\"title-plain-text\\" placeholder=\\"(no title)\\" rows=\\"1\\" style=\\"overflow: hidden; word-wrap: break-word; resize: none; height: 18px;\\"></textarea></div><div class=\\"components-panel__row\\"><button type=\\"button\\" class=\\"components-button is-button is-primary\\">Reset</button></div></div></div>"`;
diff --git a/test/e2e/specs/change-detection.test.js b/test/e2e/specs/change-detection.test.js
index 944346629f60b..8db99f779d6f7 100644
--- a/test/e2e/specs/change-detection.test.js
+++ b/test/e2e/specs/change-detection.test.js
@@ -2,7 +2,13 @@
  * Internal dependencies
  */
 import '../support/bootstrap';
-import { newPost, newDesktopBrowserPage, pressWithModifier } from '../support/utils';
+import {
+	newPost,
+	newDesktopBrowserPage,
+	pressWithModifier,
+	ensureSidebarOpened,
+	publishPost,
+} from '../support/utils';
 
 describe( 'Change detection', () => {
 	let handleInterceptedRequest, hadInterceptedSave;
@@ -83,7 +89,47 @@ describe( 'Change detection', () => {
 			page.waitForSelector( '.editor-post-saved-state.is-saved' ),
 		] );
 
-		// Still dirty after an autosave.
+		// Autosave draft as same user should do full save, i.e. not dirty.
+		await assertIsDirty( false );
+	} );
+
+	it( 'Should prompt to confirm unsaved changes for autosaved draft for non-content fields', async () => {
+		await page.type( '.editor-post-title__input', 'Hello World' );
+
+		// Toggle post as sticky (not persisted for autosave).
+		await ensureSidebarOpened();
+		await page.click( '[id^="post-sticky-toggle-"]' );
+
+		// Force autosave to occur immediately.
+		await Promise.all( [
+			page.evaluate( () => window.wp.data.dispatch( 'core/editor' ).autosave() ),
+			page.waitForSelector( '.editor-post-saved-state.is-autosaving' ),
+			page.waitForSelector( '.editor-post-saved-state.is-saved' ),
+		] );
+
+		await assertIsDirty( true );
+	} );
+
+	it( 'Should prompt to confirm unsaved changes for autosaved published post', async () => {
+		await page.type( '.editor-post-title__input', 'Hello World' );
+
+		await publishPost();
+
+		// Close publish panel.
+		await Promise.all( [
+			page.waitForFunction( () => ! document.querySelector( '.editor-post-publish-panel' ) ),
+			page.click( '.editor-post-publish-panel__header button' ),
+		] );
+
+		// Should be dirty after autosave change of published post.
+		await page.type( '.editor-post-title__input', '!' );
+
+		await Promise.all( [
+			page.waitForSelector( '.editor-post-publish-button.is-busy' ),
+			page.waitForSelector( '.editor-post-publish-button:not( .is-busy )' ),
+			page.evaluate( () => window.wp.data.dispatch( 'core/editor' ).autosave() ),
+		] );
+
 		await assertIsDirty( true );
 	} );
 
diff --git a/test/e2e/specs/plugins-api.test.js b/test/e2e/specs/plugins-api.test.js
index b3521a57f349c..b9ada2a231331 100644
--- a/test/e2e/specs/plugins-api.test.js
+++ b/test/e2e/specs/plugins-api.test.js
@@ -2,7 +2,12 @@
  * Internal dependencies
  */
 import '../support/bootstrap';
-import { newPost, newDesktopBrowserPage, toggleMoreMenuItem } from '../support/utils';
+import {
+	clickOnMoreMenuItem,
+	openDocumentSettingsSidebar,
+	newPost,
+	newDesktopBrowserPage,
+} from '../support/utils';
 import { activatePlugin, deactivatePlugin } from '../support/plugins';
 
 describe( 'Using Plugins API', () => {
@@ -17,17 +22,28 @@ describe( 'Using Plugins API', () => {
 		await deactivatePlugin( 'gutenberg-test-plugin-plugins-api' );
 	} );
 
-	it( 'Should open plugins sidebar using More Menu item and render content', async () => {
-		await toggleMoreMenuItem( 'My title plugin' );
+	describe( 'Post Status Info', () => {
+		it( 'Should render post status info inside Document Setting sidebar', async () => {
+			await openDocumentSettingsSidebar();
 
-		const pluginSidebarContent = await page.$eval( '.edit-post-sidebar', ( el ) => el.innerHTML );
-		expect( pluginSidebarContent ).toMatchSnapshot();
+			const pluginPostStatusInfoText = await page.$eval( '.edit-post-post-status .my-post-status-info-plugin', ( el ) => el.innerText );
+			expect( pluginPostStatusInfoText ).toBe( 'My post status info' );
+		} );
 	} );
 
-	it( 'Should close plugins sidebar using More Menu item', async () => {
-		await toggleMoreMenuItem( 'My title plugin' );
+	describe( 'Sidebar', () => {
+		it( 'Should open plugins sidebar using More Menu item and render content', async () => {
+			await clickOnMoreMenuItem( 'Sidebar title plugin' );
 
-		const pluginSidebar = await page.$( '.edit-post-sidebar' );
-		expect( pluginSidebar ).toBeNull();
+			const pluginSidebarContent = await page.$eval( '.edit-post-sidebar', ( el ) => el.innerHTML );
+			expect( pluginSidebarContent ).toMatchSnapshot();
+		} );
+
+		it( 'Should close plugins sidebar using More Menu item', async () => {
+			await clickOnMoreMenuItem( 'Sidebar title plugin' );
+
+			const pluginSidebar = await page.$( '.edit-post-sidebar' );
+			expect( pluginSidebar ).toBeNull();
+		} );
 	} );
 } );
diff --git a/test/e2e/specs/preview.test.js b/test/e2e/specs/preview.test.js
new file mode 100644
index 0000000000000..76f92ca706965
--- /dev/null
+++ b/test/e2e/specs/preview.test.js
@@ -0,0 +1,158 @@
+/**
+ * External dependencies
+ */
+import { parse } from 'url';
+
+/**
+ * Internal dependencies
+ */
+import '../support/bootstrap';
+import {
+	newPost,
+	newDesktopBrowserPage,
+	getUrl,
+	publishPost,
+} from '../support/utils';
+
+describe( 'Preview', () => {
+	beforeAll( async () => {
+		await newDesktopBrowserPage();
+	} );
+
+	beforeEach( async () => {
+		await newPost();
+	} );
+
+	it( 'Should open a preview window for a new post', async () => {
+		const editorPage = page;
+
+		// Disabled until content present.
+		const isPreviewDisabled = await page.$$eval(
+			'.editor-post-preview:not( :disabled )',
+			( enabledButtons ) => ! enabledButtons.length,
+		);
+		expect( isPreviewDisabled ).toBe( true );
+
+		await editorPage.type( '.editor-post-title__input', 'Hello World' );
+
+		// Don't proceed with autosave until preview window page is resolved.
+		await editorPage.setRequestInterception( true );
+
+		let [ , previewPage ] = await Promise.all( [
+			editorPage.click( '.editor-post-preview' ),
+			new Promise( ( resolve ) => {
+				browser.once( 'targetcreated', async ( target ) => {
+					resolve( await target.page() );
+				} );
+			} ),
+		] );
+
+		// Interstitial screen while save in progress.
+		expect( previewPage.url() ).toBe( 'about:blank' );
+
+		// Release request intercept should allow redirect to occur after save.
+		await Promise.all( [
+			previewPage.waitForNavigation(),
+			editorPage.setRequestInterception( false ),
+		] );
+
+		// When autosave completes for a new post, the URL of the editor should
+		// update to include the ID. Use this to assert on preview URL.
+		const [ , postId ] = await ( await editorPage.waitForFunction( () => {
+			return window.location.search.match( /[\?&]post=(\d+)/ );
+		} ) ).jsonValue();
+
+		let expectedPreviewURL = getUrl( '', `?p=${ postId }&preview=true` );
+		expect( previewPage.url() ).toBe( expectedPreviewURL );
+
+		// Title in preview should match input.
+		let previewTitle = await previewPage.$eval( '.entry-title', ( node ) => node.textContent );
+		expect( previewTitle ).toBe( 'Hello World' );
+
+		// Return to editor to change title.
+		await editorPage.bringToFront();
+		await editorPage.type( '.editor-post-title__input', '!' );
+
+		// Second preview should reuse same popup frame, with interstitial.
+		await editorPage.setRequestInterception( true );
+		await Promise.all( [
+			editorPage.click( '.editor-post-preview' ),
+			// Note: `load` event is used since, while a `window.open` with
+			// `about:blank` is called, the target window doesn't actually
+			// navigate to `about:blank` (it is treated as noop). But when
+			// the `document.write` + `document.close` of the interstitial
+			// finishes, a `load` event is fired.
+			new Promise( ( resolve ) => previewPage.once( 'load', resolve ) ),
+		] );
+		await editorPage.setRequestInterception( false );
+
+		// Wait for preview to load.
+		await new Promise( ( resolve ) => {
+			previewPage.once( 'load', resolve );
+		} );
+
+		// Title in preview should match updated input.
+		previewTitle = await previewPage.$eval( '.entry-title', ( node ) => node.textContent );
+		expect( previewTitle ).toBe( 'Hello World!' );
+
+		// Pressing preview without changes should bring same preview window to
+		// front and reload, but should not show interstitial. Intercept editor
+		// requests in case a save attempt occurs, to avoid race condition on
+		// the load event and title retrieval.
+		await editorPage.bringToFront();
+		await editorPage.setRequestInterception( true );
+		await editorPage.click( '.editor-post-preview' );
+		await new Promise( ( resolve ) => previewPage.once( 'load', resolve ) );
+		previewTitle = await previewPage.$eval( '.entry-title', ( node ) => node.textContent );
+		expect( previewTitle ).toBe( 'Hello World!' );
+		await editorPage.setRequestInterception( false );
+
+		// Preview for published post (no unsaved changes) directs to canonical
+		// URL for post.
+		await editorPage.bringToFront();
+		await publishPost();
+		await Promise.all( [
+			page.waitForFunction( () => ! document.querySelector( '.editor-post-preview' ) ),
+			page.click( '.editor-post-publish-panel__header button' ),
+		] );
+		expectedPreviewURL = await editorPage.$eval( '.notice-success a', ( node ) => node.href );
+		// Note / Temporary: It's expected that Chrome should reuse the same
+		// tab with window name `wp-preview-##`, yet in this instance a new tab
+		// is unfortunately created.
+		previewPage = ( await Promise.all( [
+			editorPage.click( '.editor-post-preview' ),
+			new Promise( ( resolve ) => {
+				browser.once( 'targetcreated', async ( target ) => {
+					resolve( await target.page() );
+				} );
+			} ),
+		] ) )[ 1 ];
+		expect( previewPage.url() ).toBe( expectedPreviewURL );
+
+		// Return to editor to change title.
+		await editorPage.bringToFront();
+		await editorPage.type( '.editor-post-title__input', ' And more.' );
+
+		// Published preview should reuse same popup frame, with interstitial.
+		await editorPage.setRequestInterception( true );
+		await Promise.all( [
+			editorPage.click( '.editor-post-preview' ),
+			new Promise( ( resolve ) => previewPage.once( 'load', resolve ) ),
+		] );
+		await editorPage.setRequestInterception( false );
+
+		// Wait for preview to load.
+		await new Promise( ( resolve ) => {
+			previewPage.once( 'load', resolve );
+		} );
+
+		// Title in preview should match updated input.
+		previewTitle = await previewPage.$eval( '.entry-title', ( node ) => node.textContent );
+		expect( previewTitle ).toBe( 'Hello World! And more.' );
+
+		// Published preview URL should include ID and nonce parameters.
+		const { query } = parse( previewPage.url(), true );
+		expect( query ).toHaveProperty( 'preview_id' );
+		expect( query ).toHaveProperty( 'preview_nonce' );
+	} );
+} );
diff --git a/test/e2e/specs/publishing.test.js b/test/e2e/specs/publishing.test.js
index c48758942c5eb..3a5a219c6e955 100644
--- a/test/e2e/specs/publishing.test.js
+++ b/test/e2e/specs/publishing.test.js
@@ -5,6 +5,7 @@ import '../support/bootstrap';
 import {
 	newPost,
 	newDesktopBrowserPage,
+	publishPost,
 } from '../support/utils';
 
 describe( 'Publishing', () => {
@@ -19,18 +20,7 @@ describe( 'Publishing', () => {
 	it( 'Should publish a post and close the panel once we start editing again', async () => {
 		await page.type( '.editor-post-title__input', 'E2E Test Post' );
 
-		// Opens the publish panel
-		await page.click( '.editor-post-publish-panel__toggle' );
-
-		// Disable reason: Wait for a second ( wait for the animation )
-		// eslint-disable-next-line no-restricted-syntax
-		await page.waitFor( 1000 );
-
-		// Publish the post
-		await page.click( '.editor-post-publish-button' );
-
-		// A success notice should show up
-		page.waitForSelector( '.notice-success' );
+		await publishPost();
 
 		// The post publish panel is visible
 		expect( await page.$( '.editor-post-publish-panel' ) ).not.toBeNull();
diff --git a/test/e2e/specs/sidebar-behaviour.test.js b/test/e2e/specs/sidebar-behaviour.test.js
new file mode 100644
index 0000000000000..6ffbd046def18
--- /dev/null
+++ b/test/e2e/specs/sidebar-behaviour.test.js
@@ -0,0 +1,80 @@
+/**
+ * Internal dependencies
+ */
+import '../support/bootstrap';
+import { clearLocalStorage, newPost, newDesktopBrowserPage, setViewport } from '../support/utils';
+
+const SIDEBAR_SELECTOR = '.edit-post-sidebar';
+const ACTIVE_SIDEBAR_TAB_SELECTOR = '.edit-post-sidebar__panel-tab.is-active';
+const ACTIVE_SIDEBAR_BUTTON_TEXT = 'Document';
+
+describe( 'Publishing', () => {
+	beforeAll( async () => {
+		await newDesktopBrowserPage();
+	} );
+
+	afterEach( async () => {
+		await clearLocalStorage();
+		await page.goto( 'about:blank' );
+		await setViewport( 'large' );
+	} );
+
+	it( 'Should have sidebar visible at the start with document sidebar active on desktop', async () => {
+		await setViewport( 'large' );
+		await newPost();
+		const { nodesCount, content, height, width } = await page.$$eval( ACTIVE_SIDEBAR_TAB_SELECTOR, ( nodes ) => {
+			const firstNode = nodes[ 0 ];
+			return {
+				nodesCount: nodes.length,
+				content: firstNode.innerText,
+				height: firstNode.offsetHeight,
+				width: firstNode.offsetWidth,
+			};
+		} );
+
+		// should have only one active sidebar tab.
+		expect( nodesCount ).toBe( 1 );
+
+		// the active sidebar tab should be document.
+		expect( content ).toBe( ACTIVE_SIDEBAR_BUTTON_TEXT );
+
+		// the active sidebar tab should be visible
+		expect( width ).toBeGreaterThan( 10 );
+		expect( height ).toBeGreaterThan( 10 );
+	} );
+
+	it( 'Should have the sidebar closed by default on mobile', async () => {
+		await setViewport( 'small' );
+		await newPost();
+		const sidebar = await page.$( SIDEBAR_SELECTOR );
+		expect( sidebar ).toBeNull();
+	} );
+
+	it( 'Should close the sidebar when resizing from desktop to mobile', async () => {
+		await setViewport( 'large' );
+		await newPost();
+
+		const sidebars = await page.$$( SIDEBAR_SELECTOR );
+		expect( sidebars ).toHaveLength( 1 );
+
+		await setViewport( 'small' );
+
+		const sidebarsMobile = await page.$$( SIDEBAR_SELECTOR );
+		// sidebar should be closed when resizing to mobile.
+		expect( sidebarsMobile ).toHaveLength( 0 );
+	} );
+
+	it( 'Should reopen sidebar the sidebar when resizing from mobile to desktop if the sidebar was closed automatically', async () => {
+		await setViewport( 'large' );
+		await newPost();
+		await setViewport( 'small' );
+
+		const sidebarsMobile = await page.$$( SIDEBAR_SELECTOR );
+		expect( sidebarsMobile ).toHaveLength( 0 );
+
+		await setViewport( 'large' );
+
+		const sidebarsDesktop = await page.$$( SIDEBAR_SELECTOR );
+		expect( sidebarsDesktop ).toHaveLength( 1 );
+	} );
+} );
diff --git a/test/e2e/specs/templates.test.js b/test/e2e/specs/templates.test.js
index f0cc6e4d7e595..8b48b339adf36 100644
--- a/test/e2e/specs/templates.test.js
+++ b/test/e2e/specs/templates.test.js
@@ -2,7 +2,7 @@
  * Internal dependencies
  */
 import '../support/bootstrap';
-import { newPost, newDesktopBrowserPage, toggleMoreMenuItem } from '../support/utils';
+import { clickOnMoreMenuItem, newPost, newDesktopBrowserPage } from '../support/utils';
 import { activatePlugin, deactivatePlugin } from '../support/plugins';
 
 describe( 'Using a CPT with a predefined template', () => {
@@ -19,7 +19,7 @@ describe( 'Using a CPT with a predefined template', () => {
 
 	it( 'Should add a custom post types with a predefined template', async () => {
 		//Switch to Code Editor to check HTML output
-		await toggleMoreMenuItem( 'Code Editor' );
+		await clickOnMoreMenuItem( 'Code Editor' );
 
 		// Assert that the post already contains the template defined blocks
 		const textEditorContent = await page.$eval( '.editor-post-text-editor', ( element ) => element.value );
diff --git a/test/e2e/support/utils.js b/test/e2e/support/utils.js
index 97dd0e23ef2f0..99d7914e95c6e 100644
--- a/test/e2e/support/utils.js
+++ b/test/e2e/support/utils.js
@@ -26,7 +26,7 @@ const MOD_KEY = process.platform === 'darwin' ? 'Meta' : 'Control';
  */
 const REGEXP_ZWSP = /[\u200B\u200C\u200D\uFEFF]/;
 
-function getUrl( WPPath, query = '' ) {
+export function getUrl( WPPath, query = '' ) {
 	const url = new URL( WP_BASE_URL );
 
 	url.pathname = join( url.pathname, WPPath );
@@ -90,7 +90,32 @@ export async function newDesktopBrowserPage() {
 		fail( error );
 	} );
 
-	await page.setViewport( { width: 1000, height: 700 } );
+	await setViewport( 'large' );
+}
+
+export async function setViewport( type ) {
+	const allowedDimensions = {
+		large: { width: 960, height: 700 },
+		small: { width: 600, height: 700 },
+	};
+	const currentDimmension = allowedDimensions[ type ];
+	await page.setViewport( currentDimmension );
+	await waitForPageDimensions( currentDimmension.width, currentDimmension.height );
+}
+
+/**
+ * Function that waits until the page viewport has the required dimensions.
+ * It is being used to address a problem where after using setViewport the execution may continue,
+ * without the new dimensions being applied.
+ * https://github.com/GoogleChrome/puppeteer/issues/1751
+ *
+ * @param {number} width  Width of the window.
+ * @param {height} height Height of the window.
+ */
+export async function waitForPageDimensions( width, height ) {
+	await page.mainFrame().waitForFunction(
+		`window.innerWidth === ${ width } && window.innerHeight === ${ height }`
+	);
 }
 
 export async function switchToEditor( mode ) {
@@ -112,6 +137,22 @@ export async function getHTMLFromCodeEditor() {
 	return textEditorContent;
 }
 
+/**
+ * Verifies that the edit post sidebar is opened, and if it is not, opens it.
+ *
+ * @return {Promise} Promise resolving once the edit post sidebar is opened.
+ */
+export async function ensureSidebarOpened() {
+	// This try/catch flow relies on the fact that `page.$eval` throws an error
+	// if the element matching the given selector does not exist. Thus, if an
+	// error is thrown, it can be inferred that the sidebar is not opened.
+	try {
+		return page.$eval( '.edit-post-sidebar', () => {} );
+	} catch ( error ) {
+		return page.click( '.edit-post-header__settings [aria-label="Settings"]' );
+	}
+}
+
 /**
  * Opens the inserter, searches for the given term, then selects the first
  * result that appears.
@@ -149,12 +190,49 @@ export async function pressWithModifier( modifier, key ) {
 }
 
 /**
- * Toggles More Menu item, searchers for the button with the text provided and clicks it.
+ * Clicks on More Menu item, searchers for the button with the text provided and clicks it.
  *
  * @param {string} buttonLabel The label to search the button for.
  */
-export async function toggleMoreMenuItem( buttonLabel ) {
+export async function clickOnMoreMenuItem( buttonLabel ) {
 	await page.click( '.edit-post-more-menu [aria-label="More"]' );
 	const itemButton = ( await page.$x( `//button[contains(text(), \'${ buttonLabel }\')]` ) )[ 0 ];
 	await itemButton.click( 'button' );
 }
+
+/**
+ * Publishes the post, resolving once the request is complete (once a notice
+ * is displayed).
+ *
+ * @return {Promise} Promise resolving when publish is complete.
+ */
+export async function publishPost() {
+	// Opens the publish panel
+	await page.click( '.editor-post-publish-panel__toggle' );
+
+	// Disable reason: Wait for the animation to complete, since otherwise the
+	// click attempt may occur at the wrong point.
+	// eslint-disable-next-line no-restricted-syntax
+	await page.waitFor( 100 );
+
+	// Publish the post
+	await page.click( '.editor-post-publish-button' );
+
+	// A success notice should show up
+	return page.waitForSelector( '.notice-success' );
+}
+
+/**
+ * Clicks on the button in the header which opens Document Settings sidebar when it is closed.
+ */
+export async function openDocumentSettingsSidebar() {
+	const openButton = await page.$( '.edit-post-header__settings button[aria-label="Settings"][aria-expaned="false"]' );
+
+	if ( openButton ) {
+		await page.click( openButton );
+	}
+}
+
+export async function clearLocalStorage() {
+	await page.evaluate( () => window.localStorage.clear() );
+}
diff --git a/test/e2e/test-plugins/hooks-api/index.js b/test/e2e/test-plugins/hooks-api/index.js
index 34cff1d758ad3..eb45316565f38 100644
--- a/test/e2e/test-plugins/hooks-api/index.js
+++ b/test/e2e/test-plugins/hooks-api/index.js
@@ -53,7 +53,7 @@
 	}
 
 	addFilter(
-		'blocks.BlockEdit',
+		'editor.BlockEdit',
 		'e2e/hooks-api/add-reset-block-button',
 		addResetBlockButton,
 		100
diff --git a/test/e2e/test-plugins/plugins-api.php b/test/e2e/test-plugins/plugins-api.php
index 55a99872afd5a..a78ed2d770786 100644
--- a/test/e2e/test-plugins/plugins-api.php
+++ b/test/e2e/test-plugins/plugins-api.php
@@ -6,17 +6,45 @@
  *
  * @package gutenberg-test-plugin-plugins-api
  */
+
 wp_enqueue_script(
-	'gutenberg-test-plugins-api',
-	plugins_url( 'plugins-api/index.js', __FILE__ ),
+	'gutenberg-test-plugins-api-post-status-info',
+	plugins_url( 'plugins-api/post-status-info.js', __FILE__ ),
+	array(
+		'wp-edit-post',
+		'wp-element',
+		'wp-i18n',
+		'wp-plugins',
+	),
+	filemtime( plugin_dir_path( __FILE__ ) . 'plugins-api/post-status-info.js' ),
+	true
+);
+
+wp_enqueue_script(
+	'gutenberg-test-plugins-api-publish-pane;',
+	plugins_url( 'plugins-api/publish-panel.js', __FILE__ ),
+	array(
+		'wp-edit-post',
+		'wp-element',
+		'wp-i18n',
+		'wp-plugins',
+	),
+	filemtime( plugin_dir_path( __FILE__ ) . 'plugins-api/publish-panel.js' ),
+	true
+);
+
+wp_enqueue_script(
+	'gutenberg-test-plugins-api-sidebar',
+	plugins_url( 'plugins-api/sidebar.js', __FILE__ ),
 	array(
 		'wp-components',
 		'wp-data',
-		'wp-element',
 		'wp-edit-post',
+		'wp-editor',
+		'wp-element',
 		'wp-i18n',
 		'wp-plugins',
 	),
-	filemtime( plugin_dir_path( __FILE__ ) . 'plugins-api/index.js' ),
+	filemtime( plugin_dir_path( __FILE__ ) . 'plugins-api/sidebar.js' ),
 	true
 );
diff --git a/test/e2e/test-plugins/plugins-api/index.js b/test/e2e/test-plugins/plugins-api/index.js
deleted file mode 100644
index 9612320add12a..0000000000000
--- a/test/e2e/test-plugins/plugins-api/index.js
+++ /dev/null
@@ -1,89 +0,0 @@
-var Button = wp.components.Button;
-var PanelBody = wp.components.PanelBody;
-var PanelRow = wp.components.PanelRow;
-var withDispatch = wp.data.withDispatch;
-var withSelect = wp.data.withSelect;
-var Fragment = wp.element.Fragment;
-var compose = wp.element.compose;
-var el = wp.element.createElement;
-var __ = wp.i18n.__;
-var registerPlugin = wp.plugins.registerPlugin;
-var PluginSidebar = wp.editPost.PluginSidebar;
-var PluginSidebarMoreMenuItem = wp.editPost.PluginSidebarMoreMenuItem;
-
-function SidebarContents( props ) {
-	var noTitle = el(
-		'em',
-		{},
-		__( '(No title)' )
-	);
-	return (
-		el(
-			PanelBody,
-			{},
-			el(
-				PanelRow,
-				{},
-				props.title || noTitle
-			),
-			el(
-				PanelRow,
-				{},
-				el(
-					Button,
-					{ isPrimary: true, onClick: props.onReset },
-					__( 'Reset' )
-				)
-			)
-		)
-	);
-}
-
-var SidebarContentsWithDataHandling = compose( [
-	withSelect( function( select ) {
-		return {
-			title: select( 'core/editor' ).getEditedPostAttribute( 'title' ),
-		};
-	} ),
-	withDispatch( function( dispatch ) {
-		return {
-			onReset: function() {
-				dispatch( 'core/editor' ).editPost( {
-					title: ''
-				} );
-			}
-		};
-	} )
-] )( SidebarContents );
-
-function MyTitlePlugin() {
-	return (
-		el(
-			Fragment,
-			{},
-			el(
-				PluginSidebar,
-				{
-					name: 'my-title-sidebar',
-					title: 'My title plugin'
-				},
-				el(
-					SidebarContentsWithDataHandling,
-					{}
-				)
-			),
-			el(
-				PluginSidebarMoreMenuItem,
-				{
-					target: 'my-title-sidebar'
-				},
-				__( 'My title plugin' )
-			)
-		)
-	);
-}
-
-registerPlugin( 'my-title-plugin', {
-	icon: 'welcome-write-blog',
-	render: MyTitlePlugin
-} );
diff --git a/test/e2e/test-plugins/plugins-api/post-status-info.js b/test/e2e/test-plugins/plugins-api/post-status-info.js
new file mode 100644
index 0000000000000..0491bff0f2186
--- /dev/null
+++ b/test/e2e/test-plugins/plugins-api/post-status-info.js
@@ -0,0 +1,18 @@
+var el = wp.element.createElement;
+var __ = wp.i18n.__;
+var registerPlugin = wp.plugins.registerPlugin;
+var PluginPostStatusInfo = wp.editPost.PluginPostStatusInfo;
+
+function MyPostStatusInfoPlugin() {
+	return el(
+		PluginPostStatusInfo,
+		{
+			className: 'my-post-status-info-plugin',
+		},
+		__( 'My post status info' )
+	);
+}
+
+registerPlugin( 'my-post-status-info-plugin', {
+	render: MyPostStatusInfoPlugin
+} );
diff --git a/test/e2e/test-plugins/plugins-api/publish-panel.js b/test/e2e/test-plugins/plugins-api/publish-panel.js
new file mode 100644
index 0000000000000..d80d0a1cb2d88
--- /dev/null
+++ b/test/e2e/test-plugins/plugins-api/publish-panel.js
@@ -0,0 +1,47 @@
+var el = wp.element.createElement;
+var Fragment = wp.element.Fragment;
+var __ = wp.i18n.__;
+var registerPlugin = wp.plugins.registerPlugin;
+var PluginPostPublishPanel = wp.editPost.PluginPostPublishPanel;
+var PluginPrePublishPanel = wp.editPost.PluginPrePublishPanel;
+
+function PanelContent() {
+	return el(
+		'p',
+		{},
+		__( 'Here is the panel content!' )
+	);
+}
+
+function MyPublishPanelPlugin() {
+	return el(
+		Fragment,
+		{},
+		el(
+			PluginPrePublishPanel,
+			{
+				className: 'my-publish-panel-plugin__pre',
+				title: __( 'My pre publish panel' )
+			},
+			el(
+				PanelContent,
+				{}
+			)
+		),
+		el(
+			PluginPostPublishPanel,
+			{
+				className: 'my-publish-panel-plugin__post',
+				title: __( 'My post publish panel' )
+			},
+			el(
+				PanelContent,
+				{}
+			)
+		)
+	);
+}
+
+registerPlugin( 'my-publish-panel-plugin', {
+	render: MyPublishPanelPlugin
+} );
diff --git a/test/e2e/test-plugins/plugins-api/sidebar.js b/test/e2e/test-plugins/plugins-api/sidebar.js
new file mode 100644
index 0000000000000..4f443ed3ecf7b
--- /dev/null
+++ b/test/e2e/test-plugins/plugins-api/sidebar.js
@@ -0,0 +1,106 @@
+var Button = wp.components.Button;
+var PanelBody = wp.components.PanelBody;
+var PanelRow = wp.components.PanelRow;
+var withDispatch = wp.data.withDispatch;
+var withSelect = wp.data.withSelect;
+var PlainText = wp.editor.PlainText;
+var Fragment = wp.element.Fragment;
+var compose = wp.element.compose;
+var el = wp.element.createElement;
+var __ = wp.i18n.__;
+var registerPlugin = wp.plugins.registerPlugin;
+var PluginSidebar = wp.editPost.PluginSidebar;
+var PluginSidebarMoreMenuItem = wp.editPost.PluginSidebarMoreMenuItem;
+
+function SidebarContents( props ) {
+	return el(
+		PanelBody,
+		{},
+		el(
+			PanelRow,
+			{},
+			el(
+				'label',
+				{
+					'htmlFor': 'title-plain-text'
+				},
+				__( 'Title:' ),
+			),
+			el(
+				PlainText,
+				{
+					id: 'title-plain-text',
+					onChange: props.updateTitle,
+					placeholder: __( '(no title)' ),
+					value: props.title
+				}
+			)
+		),
+		el(
+			PanelRow,
+			{},
+			el(
+				Button,
+				{
+					isPrimary: true,
+					onClick: props.resetTitle
+				},
+				__( 'Reset' )
+			)
+		)
+	);
+}
+
+var SidebarContentsWithDataHandling = compose( [
+	withSelect( function( select ) {
+		return {
+			title: select( 'core/editor' ).getEditedPostAttribute( 'title' ),
+		};
+	} ),
+	withDispatch( function( dispatch ) {
+		function editPost( title ) {
+			dispatch( 'core/editor' ).editPost( {
+				title: title
+			} );
+		}
+
+		return {
+			updateTitle: function( title ) {
+				editPost( title );
+			},
+			resetTitle: function() {
+				editPost( '' );
+			}
+		};
+	} )
+] )( SidebarContents );
+
+function MySidebarPlugin() {
+	return el(
+		Fragment,
+		{},
+		el(
+			PluginSidebar,
+			{
+				name: 'title-sidebar',
+				title: __( 'Sidebar title plugin' )
+			},
+			el(
+				SidebarContentsWithDataHandling,
+				{}
+			)
+		),
+		el(
+			PluginSidebarMoreMenuItem,
+			{
+				target: 'title-sidebar'
+			},
+			__( 'Sidebar title plugin' )
+		)
+	);
+}
+
+registerPlugin( 'my-sidebar-plugin', {
+	icon: 'text',
+	render: MySidebarPlugin
+} );
diff --git a/test/unit/jest.config.json b/test/unit/jest.config.json
index 26da40931049f..b95f7e0037a9a 100644
--- a/test/unit/jest.config.json
+++ b/test/unit/jest.config.json
@@ -1,12 +1,12 @@
 {
 	"rootDir": "../../",
 	"collectCoverageFrom": [
-		"(blocks|components|editor|utils|edit-post|viewport|plugins|core-blocks|nux)/**/*.js",
+		"(blocks|components|editor|utils|edit-post|viewport|core-blocks|nux)/**/*.js",
 		"packages/**/*.js"
 	],
 	"moduleNameMapper": {
-		"@wordpress\\/(blocks|components|editor|utils|edit-post|viewport|plugins|core-data|core-blocks|nux)$": "$1",
-		"@wordpress\\/(api-request|blob|core-data|data|date|dom|deprecated|element|postcss-themes)$": "packages/$1/src"
+		"@wordpress\\/(blocks|components|editor|utils|edit-post|viewport|core-data|core-blocks|nux)$": "$1",
+		"@wordpress\\/(api-request|blob|core-data|data|date|dom|deprecated|element|plugins|postcss-themes)$": "packages/$1/src"
 	},
 	"preset": "@wordpress/jest-preset-default",
 	"setupFiles": [
diff --git a/utils/deprecated.js b/utils/deprecated.js
index 44447e6a6a940..f30a82d3d9a39 100644
--- a/utils/deprecated.js
+++ b/utils/deprecated.js
@@ -2,7 +2,6 @@
  * WordPress dependencies
  */
 import * as blob from '@wordpress/blob';
-import * as dom from '@wordpress/dom';
 import originalDeprecated from '@wordpress/deprecated';
 
 const wrapFunction = ( source, sourceName, version ) =>
@@ -21,32 +20,6 @@ export const createBlobURL = wrapBlobFunction( 'createBlobURL' );
 export const getBlobByURL = wrapBlobFunction( 'getBlobByURL' );
 export const revokeBlobURL = wrapBlobFunction( 'revokeBlobURL' );
 
-// dom
-const wrapDomFunction = wrapFunction( dom, 'dom', '3.1' );
-export const computeCaretRect = wrapDomFunction( 'computeCaretRect' );
-export const documentHasSelection = wrapDomFunction( 'documentHasSelection' );
-export const focus = {
-	focusable: {
-		find: wrapFunction( dom.focus.focusable, 'dom.focus.focusable', '3.1' )( 'find' ),
-	},
-	tabbable: {
-		find: wrapFunction( dom.focus.tabbable, 'dom.focus.tabbable', '3.1' )( 'find' ),
-		isTabbableIndex: wrapFunction( dom.focus.tabbable, 'dom.focus.tabbable', '3.1' )( 'isTabbableIndex' ),
-	},
-};
-export const getRectangleFromRange = wrapDomFunction( 'getRectangleFromRange' );
-export const getScrollContainer = wrapDomFunction( 'getScrollContainer' );
-export const insertAfter = wrapDomFunction( 'insertAfter' );
-export const isHorizontalEdge = wrapDomFunction( 'isHorizontalEdge' );
-export const isTextField = wrapDomFunction( 'isTextField' );
-export const isVerticalEdge = wrapDomFunction( 'isVerticalEdge' );
-export const placeCaretAtHorizontalEdge = wrapDomFunction( 'placeCaretAtHorizontalEdge' );
-export const placeCaretAtVerticalEdge = wrapDomFunction( 'placeCaretAtVerticalEdge' );
-export const remove = wrapDomFunction( 'remove' );
-export const replace = wrapDomFunction( 'replace' );
-export const replaceTag = wrapDomFunction( 'replaceTag' );
-export const unwrap = wrapDomFunction( 'unwrap' );
-
 // deprecated
 export function deprecated( ...params ) {
 	originalDeprecated( 'wp.utils.deprecated', {
@@ -57,14 +30,3 @@ export function deprecated( ...params ) {
 
 	return originalDeprecated( ...params );
 }
-
-// viewport
-export function isExtraSmall() {
-	originalDeprecated( 'wp.utils.isExtraSmall', {
-		version: '3.1',
-		alternative: 'wp.viewport.isExtraSmall',
-		plugin: 'Gutenberg',
-	} );
-
-	return window && window.innerWidth < 782;
-}
diff --git a/utils/mediaupload.js b/utils/mediaupload.js
index c42a4996a1c4a..d0c0b7fde029a 100644
--- a/utils/mediaupload.js
+++ b/utils/mediaupload.js
@@ -1,13 +1,42 @@
 /**
  * External Dependencies
  */
-import { compact, forEach, get, noop, startsWith } from 'lodash';
+import { compact, flatMap, forEach, get, has, includes, map, noop, startsWith } from 'lodash';
+
+/**
+ * WordPress dependencies
+ */
+import { __, sprintf } from '@wordpress/i18n';
 
 /**
  * WordPress dependencies
  */
 import apiRequest from '@wordpress/api-request';
 
+/**
+ * Browsers may use unexpected mime types, and they differ from browser to browser.
+ * This function computes a flexible array of mime types from the mime type structured provided by the server.
+ * Converts { jpg|jpeg|jpe: "image/jpeg" } into [ "image/jpeg", "image/jpg", "image/jpeg", "image/jpe" ]
+ * The computation of this array instead of directly using the object,
+ * solves the problem in chrome where mp3 files have audio/mp3 as mime type instead of audio/mpeg.
+ * https://bugs.chromium.org/p/chromium/issues/detail?id=227004
+ *
+ * @param {?Object} wpMimeTypesObject Mime type object received from the server.
+ *                                    Extensions are keys separated by '|' and values are mime types associated with an extension.
+ *
+ * @return {?Array} An array of mime types or the parameter passed if it was "falsy".
+ */
+export function getMimeTypesArray( wpMimeTypesObject ) {
+	if ( ! wpMimeTypesObject ) {
+		return wpMimeTypesObject;
+	}
+	return flatMap( wpMimeTypesObject, ( mime, extensionsString ) => {
+		const [ type ] = mime.split( '/' );
+		const extensions = extensionsString.split( '|' );
+		return [ mime, ...map( extensions, ( extension ) => `${ type }/${ extension }` ) ];
+	} );
+}
+
 /**
  *	Media Upload is used by audio, image, gallery and video blocks to handle uploading a media file
  *	when a file upload button is activated.
@@ -38,15 +67,42 @@ export function mediaUpload( {
 		filesSet[ idx ] = value;
 		onFileChange( compact( filesSet ) );
 	};
+
+	// Allowed type specified by consumer
 	const isAllowedType = ( fileType ) => startsWith( fileType, `${ allowedType }/` );
+
+	// Allowed types for the current WP_User
+	const allowedMimeTypesForUser = getMimeTypesArray( get( window, [ '_wpMediaSettings', 'allowedMimeTypes' ] ) );
+	const isAllowedMimeTypeForUser = ( fileType ) => {
+		return includes( allowedMimeTypesForUser, fileType );
+	};
+
 	files.forEach( ( mediaFile, idx ) => {
 		if ( ! isAllowedType( mediaFile.type ) ) {
 			return;
 		}
 
+		// verify if user is allowed to upload this mime type
+		if ( allowedMimeTypesForUser && ! isAllowedMimeTypeForUser( mediaFile.type ) ) {
+			onError( {
+				code: 'MIME_TYPE_NOT_ALLOWED_FOR_USER',
+				message: __( 'Sorry, this file type is not permitted for security reasons.' ),
+				file: mediaFile,
+			} );
+			return;
+		}
+
 		// verify if file is greater than the maximum file upload size allowed for the site.
 		if ( maxUploadFileSize && mediaFile.size > maxUploadFileSize ) {
-			onError( { sizeAboveLimit: true, file: mediaFile } );
+			onError( {
+				code: 'SIZE_ABOVE_LIMIT',
+				message: sprintf(
+					// translators: %s: file name
+					__( '%s exceeds the maximum upload size for this site.' ),
+					mediaFile.name
+				),
+				file: mediaFile,
+			} );
 			return;
 		}
 
@@ -66,10 +122,24 @@ export function mediaUpload( {
 				};
 				setAndUpdateFiles( idx, mediaObject );
 			},
-			() => {
+			( response ) => {
 				// Reset to empty on failure.
 				setAndUpdateFiles( idx, null );
-				onError( { generalError: true, file: mediaFile } );
+				let message;
+				if ( has( response, [ 'responseJSON', 'message' ] ) ) {
+					message = get( response, [ 'responseJSON', 'message' ] );
+				} else {
+					message = sprintf(
+						// translators: %s: file name
+						__( 'Error while uploading file %s to the media library.' ),
+						mediaFile.name
+					);
+				}
+				onError( {
+					code: 'GENERAL',
+					message,
+					file: mediaFile,
+				} );
 			}
 		);
 	} );
diff --git a/utils/test/mediaupload.js b/utils/test/mediaupload.js
index 898030d3a2ec5..35dca2906e249 100644
--- a/utils/test/mediaupload.js
+++ b/utils/test/mediaupload.js
@@ -3,7 +3,7 @@
 /**
  * Internal dependencies
  */
-import { mediaUpload } from '../mediaupload';
+import { mediaUpload, getMimeTypesArray } from '../mediaupload';
 
 // mediaUpload is passed the onImagesChange function
 // so we can stub that out have it pass the data to
@@ -45,7 +45,7 @@ describe( 'mediaUpload', () => {
 		expect( console.error ).not.toHaveBeenCalled();
 	} );
 
-	it( 'should call error handler with the correct message if file size is greater than the maximum', () => {
+	it( 'should call error handler with the correct error object if file size is greater than the maximum', () => {
 		const onError = jest.fn();
 		mediaUpload( {
 			allowedType: 'image',
@@ -54,6 +54,75 @@ describe( 'mediaUpload', () => {
 			maxUploadFileSize: 512,
 			onError,
 		} );
-		expect( onError.mock.calls ).toEqual( [ [ { sizeAboveLimit: true, file: validMediaObj } ] ] );
+		expect( onError ).toBeCalledWith( {
+			code: 'SIZE_ABOVE_LIMIT',
+			file: validMediaObj,
+			message: `${ validMediaObj.name } exceeds the maximum upload size for this site.`,
+		} );
+	} );
+
+	it( 'should call error handler with the correct error object if file type is not allowed for user', () => {
+		const onError = jest.fn();
+		global._wpMediaSettings = {
+			allowedMimeTypes: { aac: 'audio/aac' },
+		};
+		mediaUpload( {
+			allowedType: 'image',
+			filesList: [ validMediaObj ],
+			onFileChange,
+			onError,
+		} );
+		expect( onError ).toBeCalledWith( {
+			code: 'MIME_TYPE_NOT_ALLOWED_FOR_USER',
+			file: validMediaObj,
+			message: 'Sorry, this file type is not permitted for security reasons.',
+		} );
+	} );
+} );
+
+describe( 'getMimeTypesArray', () => {
+	it( 'should return the parameter passed if it is "falsy" e.g: undefined or null', () => {
+		expect( getMimeTypesArray( null ) ).toEqual( null );
+		expect( getMimeTypesArray( undefined ) ).toEqual( undefined );
+	} );
+
+	it( 'should return an empty array if an empty object is passed', () => {
+		expect( getMimeTypesArray( {} ) ).toEqual( [] );
+	} );
+
+	it( 'should return the type plus a new mime type with type and subtype with the extension if a type is passed', () => {
+		expect(
+			getMimeTypesArray( { ext: 'chicken' } )
+		).toEqual(
+			[ 'chicken', 'chicken/ext' ]
+		);
+	} );
+
+	it( 'should return the mime type passed and a new mime type with type and the extension as subtype', () => {
+		expect(
+			getMimeTypesArray( { ext: 'chicken/ribs' } )
+		).toEqual(
+			[ 'chicken/ribs', 'chicken/ext' ]
+		);
+	} );
+
+	it( 'should return the mime type passed and an additional mime type per extension supported', () => {
+		expect(
+			getMimeTypesArray( { 'jpg|jpeg|jpe': 'image/jpeg' } )
+		).toEqual(
+			[ 'image/jpeg', 'image/jpg', 'image/jpeg', 'image/jpe' ]
+		);
+	} );
+
+	it( 'should handle multiple mime types', () => {
+		expect(
+			getMimeTypesArray( { 'ext|aaa': 'chicken/ribs', aaa: 'bbb' } )
+		).toEqual( [
+			'chicken/ribs',
+			'chicken/ext',
+			'chicken/aaa',
+			'bbb',
+			'bbb/aaa',
+		] );
 	} );
 } );
diff --git a/webpack.config.js b/webpack.config.js
index 2ceb56aa51a08..a653970a0adf3 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -142,21 +142,21 @@ const entryPointNames = [
 	'editor',
 	'utils',
 	'viewport',
-	'plugins',
 	'edit-post',
 	'core-blocks',
 	'nux',
 ];
 
 const gutenbergPackages = [
+	'api-request',
 	'blob',
+	'core-data',
 	'data',
 	'date',
 	'deprecated',
 	'dom',
 	'element',
-	'api-request',
-	'core-data',
+	'plugins',
 ];
 
 const wordPressPackages = [