From 02234d6e0898750660a54fcd5c42ecf46e46eb12 Mon Sep 17 00:00:00 2001
From: Tahnik Mustasin <tahnik@live.co.uk>
Date: Tue, 26 Dec 2017 20:09:31 +0000
Subject: [PATCH 01/63] Upgraded all the package and fixed auto fixable linting
 errors

---
 app/src/js/actions/fetch.js                   |    4 +-
 app/src/js/components/auth/login.js           |    3 +-
 app/src/js/components/columns/column.js       |    6 +-
 .../js/components/columns/column_topbar.js    |    6 +-
 app/src/js/components/comments/comments.js    |    4 +-
 .../components/emoji_picker/emoji_picker.js   |    3 +-
 app/src/js/components/item/item.js            |    8 +-
 app/src/js/components/navigation/items.js     |    4 +-
 app/src/js/components/navigation/sidenav.js   |   14 +-
 app/src/js/components/notifs/notif_bubbles.js |    3 +-
 app/src/js/components/notifs/notifs.js        |    7 +-
 app/src/js/components/search/search.js        |   19 +-
 app/src/js/components/settings/button.js      |    3 +-
 app/src/js/components/settings/general.js     |   22 +-
 app/src/js/components/user/user_badge.js      |    6 +-
 app/src/js/components/user/user_card.js       |   12 +-
 app/src/js/components/utilities/post_rant.js  |   34 +-
 app/src/js/components/utilities/rant_type.js  |   31 +-
 .../js/components/utilities/release_info.js   |    3 +-
 app/src/js/components/utilities/smart_area.js |    9 +-
 app/src/js/components/weekly/weekly.js        |    5 +-
 app/src/js/store.js                           |    4 +-
 package-lock.json                             | 4168 ++++++++---------
 package.json                                  |   60 +-
 24 files changed, 2045 insertions(+), 2393 deletions(-)

diff --git a/app/src/js/actions/fetch.js b/app/src/js/actions/fetch.js
index 8b6fde3c..6804bd29 100644
--- a/app/src/js/actions/fetch.js
+++ b/app/src/js/actions/fetch.js
@@ -241,7 +241,9 @@ const fetchFeed =
   if (page === 0) {
     dispatch({
       type: COLUMN.FETCH,
-      column: { ...currentColumn, items: [], page: 0, state: STATE.LOADING },
+      column: {
+        ...currentColumn, items: [], page: 0, state: STATE.LOADING,
+      },
     });
   } else {
     dispatch({
diff --git a/app/src/js/components/auth/login.js b/app/src/js/components/auth/login.js
index bfdd0ab5..6dfe03b9 100644
--- a/app/src/js/components/auth/login.js
+++ b/app/src/js/components/auth/login.js
@@ -71,7 +71,8 @@ class Login extends Component {
               this.state.password,
             )}
             disabled={auth.state === 'STATE_LOADING'}
-          >Login</button>
+          >Login
+          </button>
           <p onClick={() => noLogin(true)}><u>Not now</u></p>
         </div>
       </div>
diff --git a/app/src/js/components/columns/column.js b/app/src/js/components/columns/column.js
index 0630d4ed..2e5ce71d 100644
--- a/app/src/js/components/columns/column.js
+++ b/app/src/js/components/columns/column.js
@@ -75,7 +75,8 @@ class Column extends Component {
   }
   getItemsContainer() {
     const {
-      column, theme, vote, fetch, open, itemType, auth, showToast, custom, modal } = this.props;
+      column, theme, vote, fetch, open, itemType, auth, showToast, custom, modal,
+    } = this.props;
     const { divID } = this.state;
     if (column.items.length === 0 && column.state === STATE.SUCCESS && !custom) {
       return (
@@ -115,7 +116,8 @@ class Column extends Component {
   }
   render() {
     const {
-      column, theme, fetch, filters, removeColumn } = this.props;
+      column, theme, fetch, filters, removeColumn,
+    } = this.props;
     const { divID } = this.state;
     return (
       <div
diff --git a/app/src/js/components/columns/column_topbar.js b/app/src/js/components/columns/column_topbar.js
index 1eacb7e4..be824a7d 100644
--- a/app/src/js/components/columns/column_topbar.js
+++ b/app/src/js/components/columns/column_topbar.js
@@ -227,7 +227,8 @@ class ColumnTopBar extends Component {
                   className={`${isActive}`}
                   onClick={() => this.handlePri(primaryFilters[key])}
                   onMouseOver={() => this.handleHover(primaryFilters[key])}
-                >{primaryFilters[key]}</span>
+                >{primaryFilters[key]}
+                </span>
               );
             })}
           </div>
@@ -243,7 +244,8 @@ class ColumnTopBar extends Component {
                     key={key}
                     className={`${isActive}`}
                     onClick={() => this.handleSec(secondaryFilters[key])}
-                  >{secondaryFilters[key]}</span>
+                  >{secondaryFilters[key]}
+                  </span>
                 );
               })}
           </div>
diff --git a/app/src/js/components/comments/comments.js b/app/src/js/components/comments/comments.js
index 92504cf5..f2f5562f 100644
--- a/app/src/js/components/comments/comments.js
+++ b/app/src/js/components/comments/comments.js
@@ -15,7 +15,9 @@ class Comments extends Component {
     };
   }
   render() {
-    const { theme, vote, comments, auth, open, addMention, showToast, fetchitem } = this.props;
+    const {
+      theme, vote, comments, auth, open, addMention, showToast, fetchitem,
+    } = this.props;
     return (
       <div
         className="comments_container"
diff --git a/app/src/js/components/emoji_picker/emoji_picker.js b/app/src/js/components/emoji_picker/emoji_picker.js
index 87f06f94..04808913 100644
--- a/app/src/js/components/emoji_picker/emoji_picker.js
+++ b/app/src/js/components/emoji_picker/emoji_picker.js
@@ -59,7 +59,8 @@ class EmojiPicker extends Component {
                 onClick={() => { this.setState({ activeTab: object.name }); }}
                 key={object.name}
                 className="category"
-              >{object.icon}</Twemoji>
+              >{object.icon}
+              </Twemoji>
             ))}
           </div>
         </div>
diff --git a/app/src/js/components/item/item.js b/app/src/js/components/item/item.js
index 9bda0887..340ef4f6 100644
--- a/app/src/js/components/item/item.js
+++ b/app/src/js/components/item/item.js
@@ -135,7 +135,9 @@ class Item extends Component {
   }
   getItemCard() {
     const { item } = this.state;
-    const { theme, vote, cardItem, auth, open, showToast } = this.props;
+    const {
+      theme, vote, cardItem, auth, open, showToast,
+    } = this.props;
     return (
       <ItemCard
         modal
@@ -154,7 +156,9 @@ class Item extends Component {
   }
   getComments() {
     const { item } = this.state;
-    const { theme, vote, auth, open, showToast } = this.props;
+    const {
+      theme, vote, auth, open, showToast,
+    } = this.props;
     return (
       <Comments
         comments={item.comments}
diff --git a/app/src/js/components/navigation/items.js b/app/src/js/components/navigation/items.js
index 39c203de..5eb290fc 100644
--- a/app/src/js/components/navigation/items.js
+++ b/app/src/js/components/navigation/items.js
@@ -1,7 +1,9 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-const Items = ({ item, onClick, className, active }) => (
+const Items = ({
+  item, onClick, className, active,
+}) => (
   <div className={`item ${className} ${active}`} onClick={() => onClick()} >
     <i className={item.icon} />{ item.name }
   </div>
diff --git a/app/src/js/components/navigation/sidenav.js b/app/src/js/components/navigation/sidenav.js
index 1dfbed07..3fa598da 100644
--- a/app/src/js/components/navigation/sidenav.js
+++ b/app/src/js/components/navigation/sidenav.js
@@ -23,7 +23,9 @@ class SideNav extends Component {
     });
   }
   getUserCard() {
-    const { user, logout, login, fetchUser, open } = this.props;
+    const {
+      user, logout, login, fetchUser, open,
+    } = this.props;
     return (<CompactUserCard
       user={user}
       login={login}
@@ -33,7 +35,9 @@ class SideNav extends Component {
     />);
   }
   render() {
-    const { sideNavItems, history, location, resetColumn, open, settings } = this.props;
+    const {
+      sideNavItems, history, location, resetColumn, open, settings,
+    } = this.props;
     return (
       <div className="sidenav_container" >
         <div className="navs">
@@ -58,10 +62,10 @@ class SideNav extends Component {
           {
             settings.general.update.value &&
               <Item
-                key={'update'}
+                key="update"
                 item={{ icon: 'ion-android-alert', name: 'Update Available', route: '/' }}
-                active={''}
-                className={'updateBtn'}
+                active=""
+                className="updateBtn"
                 onClick={() => {
                   open(ITEM.RELEASE_INFO.NAME);
                 }}
diff --git a/app/src/js/components/notifs/notif_bubbles.js b/app/src/js/components/notifs/notif_bubbles.js
index 347f9de5..109dab3c 100644
--- a/app/src/js/components/notifs/notif_bubbles.js
+++ b/app/src/js/components/notifs/notif_bubbles.js
@@ -19,8 +19,7 @@ class NotifBubbles extends PureComponent {
               unread={data.num_unread}
               key={`${notif.uid}_${notif.created_time}_${notif.comment_id}_${notif.type}_${notif.rant_id}`} //eslint-disable-line
               user={data.username_map[notif.uid]}
-            />),
-          )
+            />))
         }
       </div>
     );
diff --git a/app/src/js/components/notifs/notifs.js b/app/src/js/components/notifs/notifs.js
index e161aa5e..0cd3ee7b 100644
--- a/app/src/js/components/notifs/notifs.js
+++ b/app/src/js/components/notifs/notifs.js
@@ -62,7 +62,9 @@ class Notifs extends Component {
     }
   }
   render() {
-    const { notifs, auth, open, clearNotifs } = this.props;
+    const {
+      notifs, auth, open, clearNotifs,
+    } = this.props;
 
     /* Wondering why there is notifs.notifs?
      * If you look at the default state, it looks like this:
@@ -97,7 +99,8 @@ class Notifs extends Component {
           <button
             className="notifs_clear"
             onClick={() => { clearNotifs(); }}
-          >Clear All</button>
+          >Clear All
+          </button>
           <NotifBubbles data={notifs} open={open} />
         </div>
         <div className={`notifs_bubbles_container ${this.state.active ? 'active' : ''}`} />
diff --git a/app/src/js/components/search/search.js b/app/src/js/components/search/search.js
index d2492f13..938e9ffb 100644
--- a/app/src/js/components/search/search.js
+++ b/app/src/js/components/search/search.js
@@ -117,19 +117,18 @@ class Search extends Component {
           :
           <div className="frequent_terms">
             {
-              this.state.freqTerms.map(
-                term => (
-                  <div
-                    key={term.name}
-                    className="term"
-                    onClick={() => this.onSearch(term.name)}
-                    style={{
+              this.state.freqTerms.map(term => (
+                <div
+                  key={term.name}
+                  className="term"
+                  onClick={() => this.onSearch(term.name)}
+                  style={{
                       flex: `0 1 ${term.flex}%`,
                       transform: term.flex > 31 ? 'scale(0.9)' : 'scale(1.1)',
                     }}
-                  >{term.name}</div>
-                ),
-              )
+                >{term.name}
+                </div>
+                ))
             }
           </div>
         }
diff --git a/app/src/js/components/settings/button.js b/app/src/js/components/settings/button.js
index e5fd8eaf..3850c459 100644
--- a/app/src/js/components/settings/button.js
+++ b/app/src/js/components/settings/button.js
@@ -8,7 +8,8 @@ const Button = props => (
       <button
         onClick={() => props.handleChange()}
         disabled={!props.setting.value}
-      >{props.setting.buttonText}</button>
+      >{props.setting.buttonText}
+      </button>
     </div>
   </div>
 );
diff --git a/app/src/js/components/settings/general.js b/app/src/js/components/settings/general.js
index 94ed44f9..c1cbe843 100644
--- a/app/src/js/components/settings/general.js
+++ b/app/src/js/components/settings/general.js
@@ -78,23 +78,19 @@ class General extends Component {
           );
           subSettings.push(settingComponent);
         });
-        settings.push(
-          <div className="multi_settings" key={key}>
-            { Header }
-            <div className="options">
-              {
+        settings.push(<div className="multi_settings" key={key}>
+          { Header }
+          <div className="options">
+            {
                 subSettings.map(s => s)
               }
-            </div>
-          </div>,
-        );
+          </div>
+                      </div>);
       } else {
         const component = this.getSettingComponent(setting, key);
-        settings.push(
-          <div className="single_settings" key={key}>
-            { component }
-          </div>,
-        );
+        settings.push(<div className="single_settings" key={key}>
+          { component }
+                      </div>);
       }
     });
     return settings;
diff --git a/app/src/js/components/user/user_badge.js b/app/src/js/components/user/user_badge.js
index 85119b1e..64e1f7cb 100644
--- a/app/src/js/components/user/user_badge.js
+++ b/app/src/js/components/user/user_badge.js
@@ -44,11 +44,13 @@ class UserBadge extends Component {
           <span
             className="score"
             style={{ backgroundColor: theme.user_badge.details_back }}
-          >{user.score}</span>
+          >{user.score}
+          </span>
           {user.dpp === 1 && <span
             className="score"
             style={{ background: `#${user.avatar.b}` }}
-          ><span>Supporter</span></span>}
+          ><span>Supporter</span>
+          </span>}
         </div>
       </div>
     );
diff --git a/app/src/js/components/user/user_card.js b/app/src/js/components/user/user_card.js
index 50910857..fcb32e88 100644
--- a/app/src/js/components/user/user_card.js
+++ b/app/src/js/components/user/user_card.js
@@ -64,11 +64,13 @@ class UserCard extends Component {
             <span
               className="score"
               style={{ backgroundColor: 'rgb(84, 85, 110)' }}
-            >{user.score}</span>
+            >{user.score}
+            </span>
             {user.dpp === 1 && <span
               className="score"
               style={{ background: `#${user.avatar.b}` }}
-            ><span>Supporter</span></span>}
+            ><span>Supporter</span>
+            </span>}
           </div>
         </div>
 
@@ -96,7 +98,8 @@ class UserCard extends Component {
           className="user_openprofile"
           style={{ backgroundColor: `#${user.avatar.b}` }}
           onClick={() => this.openProfile()}
-        >Open Profile</button>
+        >Open Profile
+        </button>
       </div>
     );
   }
@@ -109,7 +112,8 @@ class UserCard extends Component {
         <div
           className="close"
           onClick={() => this.props.closeCard()}
-        ><p><i className="ion-android-close" /></p></div>
+        ><p><i className="ion-android-close" /></p>
+        </div>
         {
           this.getUser()
         }
diff --git a/app/src/js/components/utilities/post_rant.js b/app/src/js/components/utilities/post_rant.js
index 7cc99bd9..322985b6 100644
--- a/app/src/js/components/utilities/post_rant.js
+++ b/app/src/js/components/utilities/post_rant.js
@@ -8,11 +8,21 @@ import Popup from '../utilities/popup';
 import Dropdown from '../utilities/dropdown/dropdown';
 
 const RANT_TYPES = [
-  { id: 1, color: '#d55063', icon: 'icon ion-chatbubble-working', header: 'Rant / Story' },
-  { id: 3, color: '#2b8a9c', icon: 'icon ion-image', header: 'Joke / Meme' },
-  { id: 4, color: '#ab73a2', icon: 'icon ion-help', header: 'Question' },
-  { id: 5, color: '#fa9a67', icon: 'icon ion-heart', header: 'devRant' },
-  { id: 6, color: '#7ac8a6', icon: 'icon ion-ios-game-controller-a', header: 'Random' },
+  {
+    id: 1, color: '#d55063', icon: 'icon ion-chatbubble-working', header: 'Rant / Story',
+  },
+  {
+    id: 3, color: '#2b8a9c', icon: 'icon ion-image', header: 'Joke / Meme',
+  },
+  {
+    id: 4, color: '#ab73a2', icon: 'icon ion-help', header: 'Question',
+  },
+  {
+    id: 5, color: '#fa9a67', icon: 'icon ion-heart', header: 'devRant',
+  },
+  {
+    id: 6, color: '#7ac8a6', icon: 'icon ion-ios-game-controller-a', header: 'Random',
+  },
 ];
 
 class PostRant extends Component {
@@ -89,8 +99,11 @@ class PostRant extends Component {
       .editRant(text, this.state.tags, item.id, auth.user.authToken)
       .then((res) => {
         if (!res.success) {
-          this.setState({ popup:
-            { ...this.state.popup, body: res.error, visible: true, className: '' },
+          this.setState({
+            popup:
+            {
+              ...this.state.popup, body: res.error, visible: true, className: '',
+            },
           });
           return;
         }
@@ -118,8 +131,11 @@ class PostRant extends Component {
       .postRant(text, this.state.tags, this.state.type, auth.user.authToken, image)
       .then((res) => {
         if (!res.success) {
-          this.setState({ popup:
-            { ...this.state.popup, body: res.error, visible: true, className: '' },
+          this.setState({
+            popup:
+            {
+              ...this.state.popup, body: res.error, visible: true, className: '',
+            },
           });
           return;
         }
diff --git a/app/src/js/components/utilities/rant_type.js b/app/src/js/components/utilities/rant_type.js
index 81e9a22f..831a2411 100644
--- a/app/src/js/components/utilities/rant_type.js
+++ b/app/src/js/components/utilities/rant_type.js
@@ -5,16 +5,30 @@ class RantType extends Component {
   constructor() {
     super();
     this.types = [
-      { id: 1, color: '#d55063', icon: 'icon ion-chatbubble-working', text: 'Rant / Story' },
-      { id: 2, color: '#e1c871', icon: 'ion-android-people', text: 'Collab' },
-      { id: 3, color: '#2b8a9c', icon: 'icon ion-image', text: 'Joke / Meme' },
-      { id: 4, color: '#ab73a2', icon: 'icon ion-help', text: 'Question' },
-      { id: 5, color: '#fa9a67', icon: 'icon ion-heart', text: 'devRant' },
-      { id: 6, color: '#7ac8a6', icon: 'icon ion-ios-game-controller-a', text: 'Random' },
+      {
+        id: 1, color: '#d55063', icon: 'icon ion-chatbubble-working', text: 'Rant / Story',
+      },
+      {
+        id: 2, color: '#e1c871', icon: 'ion-android-people', text: 'Collab',
+      },
+      {
+        id: 3, color: '#2b8a9c', icon: 'icon ion-image', text: 'Joke / Meme',
+      },
+      {
+        id: 4, color: '#ab73a2', icon: 'icon ion-help', text: 'Question',
+      },
+      {
+        id: 5, color: '#fa9a67', icon: 'icon ion-heart', text: 'devRant',
+      },
+      {
+        id: 6, color: '#7ac8a6', icon: 'icon ion-ios-game-controller-a', text: 'Random',
+      },
     ];
     this.state = {
       open: false,
-      selected: { id: 1, color: '#d55063', icon: 'ion-chatbubble-working', text: 'Rant / Story' },
+      selected: {
+        id: 1, color: '#d55063', icon: 'ion-chatbubble-working', text: 'Rant / Story',
+      },
     };
   }
 
@@ -51,8 +65,7 @@ class RantType extends Component {
                     <i className={type.icon} /><span>{type.text}</span>
                   </div>
                 </div>
-              ),
-            )
+              ))
           }
         </div>
       </div>
diff --git a/app/src/js/components/utilities/release_info.js b/app/src/js/components/utilities/release_info.js
index 47dfd500..8e81bd22 100644
--- a/app/src/js/components/utilities/release_info.js
+++ b/app/src/js/components/utilities/release_info.js
@@ -53,7 +53,8 @@ class ReleaseInfo extends Component {
             <div className="info" >
               <span>* On Windows: Update will be installed after you click update</span>
               <span>* On MacOS and Linux: Clicking update will take you to our website.
-                You have to download the latest update from there.</span>
+                You have to download the latest update from there.
+              </span>
             </div>
           </div>
         </div>
diff --git a/app/src/js/components/utilities/smart_area.js b/app/src/js/components/utilities/smart_area.js
index 2e5a8cf3..a326fff7 100644
--- a/app/src/js/components/utilities/smart_area.js
+++ b/app/src/js/components/utilities/smart_area.js
@@ -280,7 +280,8 @@ class SmartArea extends Component {
             <div
               className={`mention ${index === selectedMention ? 'active' : ''}`}
               key={mention}
-            ><p>{this.props.users[mention]}</p></div>
+            ><p>{this.props.users[mention]}</p>
+            </div>
           ))}
         </div>
         <TwemojiComp
@@ -303,7 +304,8 @@ class SmartArea extends Component {
           <p
             className="charLeft"
             ref={(node) => { this.charLeft = node; }}
-          >{this.props.maxChar - this.props.value.length}</p>
+          >{this.props.maxChar - this.props.value.length}
+          </p>
           : null
         }
         <div className="post">
@@ -314,7 +316,8 @@ class SmartArea extends Component {
           <button
             disabled={this.props.disabled || invalidContent}
             onClick={() => this.onPost()}
-          >{btnText}</button>
+          >{btnText}
+          </button>
         </div>
       </div>
     );
diff --git a/app/src/js/components/weekly/weekly.js b/app/src/js/components/weekly/weekly.js
index f3f04737..6149abba 100644
--- a/app/src/js/components/weekly/weekly.js
+++ b/app/src/js/components/weekly/weekly.js
@@ -77,12 +77,11 @@ class Weekly extends Component {
                   width: `${theme.column.width}px`,
                 }}
               >
-                <div className={'weekly_option'}>
+                <div className="weekly_option">
                   <div className="weekDesc"><b>{`wk${week.week}`}</b> {`${week.prompt}`}</div>
                 </div>
               </div>
-            ),
-          )}
+            ))}
         </div>
 
         <Column
diff --git a/app/src/js/store.js b/app/src/js/store.js
index 31761982..bda9c220 100644
--- a/app/src/js/store.js
+++ b/app/src/js/store.js
@@ -46,9 +46,7 @@ if (
 
 settings.set('prevVersion', currentVersion);
 
-const store = createStore(reducers, initialState, composeEnhancers(
-  middleware,
-));
+const store = createStore(reducers, initialState, composeEnhancers(middleware));
 
 /**
  * In MacOS and Linux we don't have auto update
diff --git a/package-lock.json b/package-lock.json
index 765eb6ca..9ae59b81 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4,15 +4,153 @@
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
+    "@babel/code-frame": {
+      "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.3.0",
+        "esutils": "2.0.2",
+        "js-tokens": "3.0.2"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
+          "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
+          "dev": true,
+          "requires": {
+            "color-convert": "1.9.1"
+          }
+        },
+        "chalk": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
+          "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.0",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "4.5.0"
+          }
+        },
+        "supports-color": {
+          "version": "4.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
+          "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+          "dev": true,
+          "requires": {
+            "has-flag": "2.0.0"
+          }
+        }
+      }
+    },
+    "@babel/helper-function-name": {
+      "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",
+        "@babel/traverse": "7.0.0-beta.31",
+        "@babel/types": "7.0.0-beta.31"
+      }
+    },
+    "@babel/helper-get-function-arity": {
+      "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"
+      }
+    },
+    "@babel/template": {
+      "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",
+        "babylon": "7.0.0-beta.31",
+        "lodash": "4.17.4"
+      },
+      "dependencies": {
+        "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
+        }
+      }
+    },
+    "@babel/traverse": {
+      "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",
+        "@babel/types": "7.0.0-beta.31",
+        "babylon": "7.0.0-beta.31",
+        "debug": "3.1.0",
+        "globals": "10.4.0",
+        "invariant": "2.2.2",
+        "lodash": "4.17.4"
+      },
+      "dependencies": {
+        "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
+        },
+        "globals": {
+          "version": "10.4.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-10.4.0.tgz",
+          "integrity": "sha512-uNUtxIZpGyuaq+5BqGGQHsL4wUlJAXRqOm6g3Y48/CWNGTLONgBibI0lh6lGxjR2HljFYUfszb+mk4WkgMntsA==",
+          "dev": true
+        }
+      }
+    },
+    "@babel/types": {
+      "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.17.4",
+        "to-fast-properties": "2.0.0"
+      },
+      "dependencies": {
+        "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
+        }
+      }
+    },
+    "@types/node": {
+      "version": "7.0.51",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.51.tgz",
+      "integrity": "sha512-h5u7FnEnG+Fn44HfknTTvu199FzFWVSo97ToSRWvXl1F11UfN6wGnE7exUy23pFfDn+CeluvEoCoe4l2eCVC3g==",
+      "dev": true
+    },
     "7zip": {
       "version": "0.0.6",
       "resolved": "https://registry.npmjs.org/7zip/-/7zip-0.0.6.tgz",
       "integrity": "sha1-nK+xca+CMpSQNTtIFvAzR6oVCjA="
     },
     "7zip-bin": {
-      "version": "2.2.7",
-      "resolved": "https://registry.npmjs.org/7zip-bin/-/7zip-bin-2.2.7.tgz",
-      "integrity": "sha512-+rr4OgeTNrLuJAf09o3USdttEYiXvZshWMkhD6wR9v1ieXH0JM1Q2yT41/cJuJcqiPpSXlM/g3aR+Y5MWQdr0Q==",
+      "version": "2.3.4",
+      "resolved": "https://registry.npmjs.org/7zip-bin/-/7zip-bin-2.3.4.tgz",
+      "integrity": "sha512-s2ZfgRWXeNUQTQE3O85CDDrU2Uo90pMlMkTxkz85wQOuzVxB8t4cubMPup3WlTPFKHQgb6lDkAHS3ljkUSFO6A==",
       "dev": true,
       "requires": {
         "7zip-bin-win": "2.1.1"
@@ -24,16 +162,10 @@
       "integrity": "sha512-6VGEW7PXGroTsoI2QW3b0ea95HJmbVBHvfANKLLMzSzFA1zKqVX5ybNuhmeGpf6vA0x8FJTt6twpprDANsY5WQ==",
       "optional": true
     },
-    "@types/node": {
-      "version": "7.0.46",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.46.tgz",
-      "integrity": "sha512-u+JAi1KtmaUoU/EHJkxoiuvzyo91FCE41Z9TZWWcOUU3P8oUdlDLdrGzCGWySPgbRMD17B0B+1aaJLYI9egQ6A==",
-      "dev": true
-    },
     "abbrev": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz",
-      "integrity": "sha1-0FVMIlZjbi9W58LlrRg/hZQo2B8=",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
       "dev": true
     },
     "accepts": {
@@ -47,9 +179,9 @@
       }
     },
     "acorn": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.1.2.tgz",
-      "integrity": "sha512-o96FZLJBPY1lvTuJylGA9Bk3t/GKPPJG8H0ydQQl01crzwJgspa4AEIq/pVTXigmK0PHVQhiAtn8WMBLL9D2WA==",
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.2.1.tgz",
+      "integrity": "sha512-jG0u7c4Ly+3QkkW18V+NRDN+4bWHdln30NL1ZL2AvFZZmQe/BfopYCtghCKKVBUSetZ4QKcyA0pY6/4Gw8Pv8w==",
       "dev": true
     },
     "acorn-dynamic-import": {
@@ -87,19 +219,21 @@
       }
     },
     "ajv": {
-      "version": "4.11.8",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
-      "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
+      "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",
-        "json-stable-stringify": "1.0.1"
+        "fast-deep-equal": "1.0.0",
+        "fast-json-stable-stringify": "2.0.0",
+        "json-schema-traverse": "0.3.1"
       }
     },
     "ajv-keywords": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.0.tgz",
-      "integrity": "sha1-opbhf3v658HOT34N5T0pyzIWLfA=",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.1.tgz",
+      "integrity": "sha1-YXmX/F9gV2iUxDX5QNgZ4TW4B2I=",
       "dev": true
     },
     "align-text": {
@@ -132,39 +266,6 @@
       "dev": true,
       "requires": {
         "string-width": "2.1.1"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-          "dev": true
-        },
-        "string-width": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-          "dev": true,
-          "requires": {
-            "is-fullwidth-code-point": "2.0.0",
-            "strip-ansi": "4.0.0"
-          }
-        },
-        "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"
-          }
-        }
       }
     },
     "ansi-escapes": {
@@ -201,18 +302,17 @@
       }
     },
     "app-package-builder": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/app-package-builder/-/app-package-builder-1.3.1.tgz",
-      "integrity": "sha512-TnKHgkO0zW1x9b1bDAJSPNx9FljH21GaG8gF7uAn134GvR4hVO98h+zQ9lDYKV4uyW+F6eKrWKAUhUupD2sNuQ==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/app-package-builder/-/app-package-builder-2.0.1.tgz",
+      "integrity": "sha512-epdSeiJdLwTN9YBsgzl7aHyRlKodpF4+Svl7eXQ+ddx/nFKrhHfF5b3pseelNiVh521nHzVSn264yujD/yTC1w==",
       "dev": true,
       "requires": {
         "bluebird-lst": "1.0.5",
-        "builder-util": "3.1.0",
-        "builder-util-runtime": "2.4.0",
-        "fs-extra-p": "4.4.4",
-        "int64-buffer": "0.1.9",
-        "js-yaml": "3.10.0",
-        "rabin-bindings": "1.7.3"
+        "builder-util": "3.4.4",
+        "builder-util-runtime": "3.4.1",
+        "fs-extra-p": "4.5.0",
+        "int64-buffer": "0.1.10",
+        "rabin-bindings": "1.7.4"
       }
     },
     "applescript": {
@@ -221,9 +321,9 @@
       "integrity": "sha1-u4evVoytA0pOSMS9r2Bno6JwExc="
     },
     "aproba": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.1.2.tgz",
-      "integrity": "sha512-ZpYajIfO0j2cOFTO955KUMIKNmj6zhX8kVztMAxFsDaMwz+9Z9SV0uou2pC9HJqcfpffOsjnbrDMvkNy+9RXPw==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
+      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
       "dev": true
     },
     "are-we-there-yet": {
@@ -234,38 +334,6 @@
       "requires": {
         "delegates": "1.0.0",
         "readable-stream": "2.3.3"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "2.3.3",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-          "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "1.0.0",
-            "process-nextick-args": "1.0.7",
-            "safe-buffer": "5.1.1",
-            "string_decoder": "1.0.3",
-            "util-deprecate": "1.0.2"
-          }
-        },
-        "string_decoder": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-          "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "5.1.1"
-          }
-        }
       }
     },
     "argparse": {
@@ -325,7 +393,7 @@
       "dev": true,
       "requires": {
         "define-properties": "1.1.2",
-        "es-abstract": "1.8.2"
+        "es-abstract": "1.10.0"
       }
     },
     "array-map": {
@@ -379,7 +447,7 @@
       "dev": true,
       "requires": {
         "bluebird-lst": "1.0.5",
-        "fs-extra-p": "4.4.4"
+        "fs-extra-p": "4.5.0"
       }
     },
     "asn1": {
@@ -389,9 +457,9 @@
       "dev": true
     },
     "asn1.js": {
-      "version": "4.9.1",
-      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.1.tgz",
-      "integrity": "sha1-SLokC0WpKA6UdImQull9IWYX/UA=",
+      "version": "4.9.2",
+      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.2.tgz",
+      "integrity": "sha512-b/OsSjvWEo8Pi8H0zsDd2P6Uqo2TK2pH8gNLSJtNLM2Db0v2QaAZ0pBQJXVjAn4gBuugeVDr7s63ZogpUIwWDg==",
       "dev": true,
       "requires": {
         "bn.js": "4.11.8",
@@ -409,9 +477,9 @@
       }
     },
     "assert-plus": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
-      "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
       "dev": true
     },
     "ast-types-flow": {
@@ -421,9 +489,9 @@
       "dev": true
     },
     "async": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.4.1.tgz",
-      "integrity": "sha1-YqVrJ5yYoR0JhwlqAcw+6463u9c=",
+      "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.17.4"
@@ -453,21 +521,21 @@
       "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
     },
     "auto-launch": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/auto-launch/-/auto-launch-5.0.1.tgz",
-      "integrity": "sha1-IBWoowOEq+Dn+Yy9yoFFzxVHU64=",
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/auto-launch/-/auto-launch-5.0.5.tgz",
+      "integrity": "sha512-ppdF4mihhYzMYLuCcx9H/c5TUOCev8uM7en53zWVQhyYAJrurd2bFZx3qQVeJKF2jrc7rsPRNN5cD+i23l6PdA==",
       "requires": {
         "applescript": "1.0.0",
         "mkdirp": "0.5.1",
         "path-is-absolute": "1.0.1",
         "untildify": "3.0.2",
-        "winreg": "1.2.2"
+        "winreg": "1.2.4"
       }
     },
     "autolinker": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/autolinker/-/autolinker-1.4.4.tgz",
-      "integrity": "sha1-hKqqm7B8eU8IVc1wQaMe7G9vqMo="
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/autolinker/-/autolinker-1.6.0.tgz",
+      "integrity": "sha1-utN2t62OQV8i8QL8Dzf2QOZPHL8="
     },
     "autoprefixer": {
       "version": "6.7.7",
@@ -476,17 +544,17 @@
       "dev": true,
       "requires": {
         "browserslist": "1.7.7",
-        "caniuse-db": "1.0.30000726",
+        "caniuse-db": "1.0.30000784",
         "normalize-range": "0.1.2",
         "num2fraction": "1.2.2",
-        "postcss": "5.2.17",
+        "postcss": "5.2.18",
         "postcss-value-parser": "3.3.0"
       }
     },
     "aws-sign2": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
-      "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=",
+      "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
     },
     "aws4": {
@@ -531,169 +599,52 @@
         "babel-traverse": "6.26.0",
         "babel-types": "6.26.0",
         "babylon": "6.18.0",
-        "convert-source-map": "1.5.0",
-        "debug": "2.6.8",
+        "convert-source-map": "1.5.1",
+        "debug": "2.6.9",
         "json5": "0.5.1",
         "lodash": "4.17.4",
         "minimatch": "3.0.4",
         "path-is-absolute": "1.0.1",
-        "private": "0.1.7",
+        "private": "0.1.8",
         "slash": "1.0.0",
         "source-map": "0.5.7"
       },
       "dependencies": {
         "debug": {
-          "version": "2.6.8",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
-          "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
+          "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"
           }
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true
         }
       }
     },
     "babel-eslint": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-8.0.1.tgz",
-      "integrity": "sha512-h3moF6PCTQE06UjMMG+ydZSBvZ4Q7rqPE/5WAUOvUyHYUTqxm8JVhjZRiG1avI/tGVOK4BnZLDQapyLzh8DeKg==",
+      "version": "8.1.2",
+      "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-8.1.2.tgz",
+      "integrity": "sha512-IE+glF8t0lLoldylN7JyR8gT7e3jwyuNH2ds8g3UVUwGob/U4iT7Xpsiq2kQ8QGLb0eX4RcQXNqeW6mgPysu9A==",
       "dev": true,
       "requires": {
-        "babel-code-frame": "7.0.0-beta.0",
-        "babel-traverse": "7.0.0-beta.0",
-        "babel-types": "7.0.0-beta.0",
-        "babylon": "7.0.0-beta.22"
+        "@babel/code-frame": "7.0.0-beta.31",
+        "@babel/traverse": "7.0.0-beta.31",
+        "@babel/types": "7.0.0-beta.31",
+        "babylon": "7.0.0-beta.31",
+        "eslint-scope": "3.7.1",
+        "eslint-visitor-keys": "1.0.0"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
-          "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
-          "dev": true,
-          "requires": {
-            "color-convert": "1.9.0"
-          }
-        },
-        "babel-code-frame": {
-          "version": "7.0.0-beta.0",
-          "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-7.0.0-beta.0.tgz",
-          "integrity": "sha512-/xr1ADm5bnTjjN+xwoXb7lF4v2rnxMzNZzFU7h8SxB+qB6+IqSTOOqVcpaPTUC2Non/MbQxS3OIZnJpQ2X21aQ==",
-          "dev": true,
-          "requires": {
-            "chalk": "2.1.0",
-            "esutils": "2.0.2",
-            "js-tokens": "3.0.2"
-          }
-        },
-        "babel-helper-function-name": {
-          "version": "7.0.0-beta.0",
-          "resolved": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-7.0.0-beta.0.tgz",
-          "integrity": "sha512-DaQccFBBWBEzMdqbKmNXamY0m1yLHJGOdbbEsNoGdJrrU7wAF3wwowtDDPzF0ZT3SqJXPgZW/P2kgBX9moMuAA==",
-          "dev": true,
-          "requires": {
-            "babel-helper-get-function-arity": "7.0.0-beta.0",
-            "babel-template": "7.0.0-beta.0",
-            "babel-traverse": "7.0.0-beta.0",
-            "babel-types": "7.0.0-beta.0"
-          }
-        },
-        "babel-helper-get-function-arity": {
-          "version": "7.0.0-beta.0",
-          "resolved": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-7.0.0-beta.0.tgz",
-          "integrity": "sha512-csqAic15/2Vm1951nJxkkL9K8E6ojyNF/eAOjk7pqJlO8kvgrccGNFCV9eDwcGHDPe5AjvJGwVSAcQ5fit9wuA==",
-          "dev": true,
-          "requires": {
-            "babel-types": "7.0.0-beta.0"
-          }
-        },
-        "babel-messages": {
-          "version": "7.0.0-beta.0",
-          "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-7.0.0-beta.0.tgz",
-          "integrity": "sha512-eXdShsm9ZTh9AQhlIaAn6HR3xWpxCnK9ZwIDA9QyjnwTgMctGxHHflw4b4RJ3/ZjTL0Vrmvm0tQXPkp49mTAUw==",
-          "dev": true
-        },
-        "babel-template": {
-          "version": "7.0.0-beta.0",
-          "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-7.0.0-beta.0.tgz",
-          "integrity": "sha512-tmdH+MmmU0F6Ur8humpevSmFzYKbrN3Oru0g5Qyg4R6+sxjnzZmnvzUbsP0aKMr7tB0Ua6xhEb9arKTOsEMkyA==",
-          "dev": true,
-          "requires": {
-            "babel-traverse": "7.0.0-beta.0",
-            "babel-types": "7.0.0-beta.0",
-            "babylon": "7.0.0-beta.22",
-            "lodash": "4.17.4"
-          }
-        },
-        "babel-traverse": {
-          "version": "7.0.0-beta.0",
-          "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-7.0.0-beta.0.tgz",
-          "integrity": "sha512-IKzuTqUcQtMRZ0Vv5RjIrGGj33eBKmNTNeRexWSyjPPuAciyNkva1rt7WXPfHfkb+dX7coRAIUhzeTUEzhnwdA==",
-          "dev": true,
-          "requires": {
-            "babel-code-frame": "7.0.0-beta.0",
-            "babel-helper-function-name": "7.0.0-beta.0",
-            "babel-messages": "7.0.0-beta.0",
-            "babel-types": "7.0.0-beta.0",
-            "babylon": "7.0.0-beta.22",
-            "debug": "3.0.1",
-            "globals": "10.1.0",
-            "invariant": "2.2.2",
-            "lodash": "4.17.4"
-          }
-        },
-        "babel-types": {
-          "version": "7.0.0-beta.0",
-          "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-7.0.0-beta.0.tgz",
-          "integrity": "sha512-rJc2kV9iPJGLlqIY71AM3nPcdkoeLRCDuR07GFgfd3lFl4TsBQq76TxYQQIZ2MONg1HpsqmuoCXr9aZ1Oa4wYw==",
-          "dev": true,
-          "requires": {
-            "esutils": "2.0.2",
-            "lodash": "4.17.4",
-            "to-fast-properties": "2.0.0"
-          }
-        },
         "babylon": {
-          "version": "7.0.0-beta.22",
-          "resolved": "https://registry.npmjs.org/babylon/-/babylon-7.0.0-beta.22.tgz",
-          "integrity": "sha512-Yl7iT8QGrS8OfR7p6R12AJexQm+brKwrryai4VWZ7NHUbPoZ5al3+klhvl/14shXZiLa7uK//OIFuZ1/RKHgoA==",
-          "dev": true
-        },
-        "chalk": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz",
-          "integrity": "sha512-LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "3.2.0",
-            "escape-string-regexp": "1.0.5",
-            "supports-color": "4.4.0"
-          }
-        },
-        "globals": {
-          "version": "10.1.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-10.1.0.tgz",
-          "integrity": "sha1-RCWhiBvg0za0qCOoKnvnJdXdmHw=",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-          "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "4.4.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz",
-          "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "2.0.0"
-          }
-        },
-        "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=",
+          "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
         }
       }
@@ -712,6 +663,14 @@
         "lodash": "4.17.4",
         "source-map": "0.5.7",
         "trim-right": "1.0.1"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true
+        }
       }
     },
     "babel-helper-bindify-decorators": {
@@ -955,7 +914,7 @@
       "requires": {
         "babel-core": "6.26.0",
         "babel-preset-minify": "0.2.0",
-        "webpack-sources": "1.0.1"
+        "webpack-sources": "1.1.0"
       }
     },
     "babel-plugin-check-es2015-constants": {
@@ -1728,7 +1687,7 @@
       "requires": {
         "babel-core": "6.26.0",
         "babel-runtime": "6.26.0",
-        "core-js": "2.5.1",
+        "core-js": "2.5.3",
         "home-or-tmp": "2.0.0",
         "lodash": "4.17.4",
         "mkdirp": "0.5.1",
@@ -1736,10 +1695,25 @@
       },
       "dependencies": {
         "core-js": {
-          "version": "2.5.1",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.1.tgz",
-          "integrity": "sha1-rmh03GaTd4m4B1T/VCjfZoGcpQs=",
+          "version": "2.5.3",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.3.tgz",
+          "integrity": "sha1-isw4NFgk8W2DZbfJtCWRaOjtYD4=",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
           "dev": true
+        },
+        "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.7"
+          }
         }
       }
     },
@@ -1749,14 +1723,14 @@
       "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
       "dev": true,
       "requires": {
-        "core-js": "2.5.1",
-        "regenerator-runtime": "0.11.0"
+        "core-js": "2.5.3",
+        "regenerator-runtime": "0.11.1"
       },
       "dependencies": {
         "core-js": {
-          "version": "2.5.1",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.1.tgz",
-          "integrity": "sha1-rmh03GaTd4m4B1T/VCjfZoGcpQs=",
+          "version": "2.5.3",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.3.tgz",
+          "integrity": "sha1-isw4NFgk8W2DZbfJtCWRaOjtYD4=",
           "dev": true
         }
       }
@@ -1785,16 +1759,16 @@
         "babel-runtime": "6.26.0",
         "babel-types": "6.26.0",
         "babylon": "6.18.0",
-        "debug": "2.6.8",
+        "debug": "2.6.9",
         "globals": "9.18.0",
         "invariant": "2.2.2",
         "lodash": "4.17.4"
       },
       "dependencies": {
         "debug": {
-          "version": "2.6.8",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
-          "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
+          "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"
@@ -1848,15 +1822,15 @@
       }
     },
     "big.js": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.1.3.tgz",
-      "integrity": "sha1-TK2iGTZS6zyp7I5VyQFWacmAaXg=",
+      "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
     },
     "binary-extensions": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.10.0.tgz",
-      "integrity": "sha1-muuabF6IY4qtFx4Wf1kAq+JINdA=",
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.11.0.tgz",
+      "integrity": "sha1-RqoXUftqL5PuXmibsQh9SxTGwgU=",
       "dev": true
     },
     "bindings": {
@@ -1872,38 +1846,6 @@
       "dev": true,
       "requires": {
         "readable-stream": "2.3.3"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "2.3.3",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-          "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "1.0.0",
-            "process-nextick-args": "1.0.7",
-            "safe-buffer": "5.1.1",
-            "string_decoder": "1.0.3",
-            "util-deprecate": "1.0.2"
-          }
-        },
-        "string_decoder": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-          "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "5.1.1"
-          }
-        }
       }
     },
     "block-stream": {
@@ -1916,10 +1858,9 @@
       }
     },
     "bluebird": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz",
-      "integrity": "sha1-eRQg1/VR7qKJdFOop3ZT+WYG1nw=",
-      "dev": true
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
+      "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA=="
     },
     "bluebird-lst": {
       "version": "1.0.5",
@@ -1927,13 +1868,6 @@
       "integrity": "sha512-Ey0bDNys5qpYPhZ/oQ9vOEvD0TYQDTILMXWP2iGfvMg7rSDde+oV4aQQgqRH+CvBFNz2BSDQnPGMUl6LKBUUQA==",
       "requires": {
         "bluebird": "3.5.1"
-      },
-      "dependencies": {
-        "bluebird": {
-          "version": "3.5.1",
-          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
-          "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA=="
-        }
       }
     },
     "bn.js": {
@@ -1968,12 +1902,6 @@
           "requires": {
             "ms": "2.0.0"
           }
-        },
-        "qs": {
-          "version": "6.5.1",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz",
-          "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==",
-          "dev": true
         }
       }
     },
@@ -1987,7 +1915,7 @@
         "deep-equal": "1.0.1",
         "dns-equal": "1.0.0",
         "dns-txt": "2.0.2",
-        "multicast-dns": "6.1.1",
+        "multicast-dns": "6.2.1",
         "multicast-dns-service-types": "1.1.0"
       }
     },
@@ -1998,18 +1926,18 @@
       "dev": true
     },
     "boom": {
-      "version": "2.10.1",
-      "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
-      "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz",
+      "integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=",
       "dev": true,
       "requires": {
-        "hoek": "2.16.3"
+        "hoek": "4.2.0"
       }
     },
     "boxen": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/boxen/-/boxen-1.2.2.tgz",
-      "integrity": "sha1-Px1AMsMP/qnUsCwyLq8up0HcvOU=",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz",
+      "integrity": "sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw==",
       "dev": true,
       "requires": {
         "ansi-align": "2.0.0",
@@ -2018,30 +1946,18 @@
         "cli-boxes": "1.0.0",
         "string-width": "2.1.1",
         "term-size": "1.2.0",
-        "widest-line": "1.0.0"
+        "widest-line": "2.0.0"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-          "dev": true
-        },
         "ansi-styles": {
           "version": "3.2.0",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
           "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
           "dev": true,
           "requires": {
-            "color-convert": "1.9.0"
+            "color-convert": "1.9.1"
           }
         },
-        "camelcase": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
-          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
-          "dev": true
-        },
         "chalk": {
           "version": "2.3.0",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
@@ -2053,37 +1969,6 @@
             "supports-color": "4.5.0"
           }
         },
-        "has-flag": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-          "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-          "dev": true
-        },
-        "string-width": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-          "dev": true,
-          "requires": {
-            "is-fullwidth-code-point": "2.0.0",
-            "strip-ansi": "4.0.0"
-          }
-        },
-        "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"
-          }
-        },
         "supports-color": {
           "version": "4.5.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
@@ -2183,12 +2068,12 @@
       }
     },
     "browserify-zlib": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz",
-      "integrity": "sha1-uzX4pRn2AOD6a4SFJByXnQFB+y0=",
+      "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": "0.2.9"
+        "pako": "1.0.6"
       }
     },
     "browserslist": {
@@ -2197,8 +2082,8 @@
       "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
       "dev": true,
       "requires": {
-        "caniuse-db": "1.0.30000726",
-        "electron-to-chromium": "1.3.21"
+        "caniuse-db": "1.0.30000784",
+        "electron-to-chromium": "1.3.30"
       }
     },
     "buffer": {
@@ -2233,26 +2118,26 @@
       "dev": true
     },
     "builder-util": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-3.1.0.tgz",
-      "integrity": "sha512-DVf9/tZqh0CGUyOGf6dHCmT34j3sd6a30tgfu89+ZcdBfYMN9Iu2piFm0BsClzhOxZE/UsJie4d9LuD1Dxm9XA==",
+      "version": "3.4.4",
+      "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-3.4.4.tgz",
+      "integrity": "sha512-TFtm1yzFd3x34dR5dIs8hxAaDvH08ZiEY3QGvwI2lo+UZos+AIeQ4q/pxPU7lBZ+BMNWzVymG/LZcNu6N3g+vQ==",
       "dev": true,
       "requires": {
-        "7zip-bin": "2.2.7",
+        "7zip-bin": "2.3.4",
         "bluebird-lst": "1.0.5",
-        "builder-util-runtime": "2.4.0",
+        "builder-util-runtime": "3.4.1",
         "chalk": "2.3.0",
         "debug": "3.1.0",
-        "fs-extra-p": "4.4.4",
-        "ini": "1.3.4",
+        "fs-extra-p": "4.5.0",
+        "ini": "1.3.5",
         "is-ci": "1.0.10",
         "js-yaml": "3.10.0",
-        "lazy-val": "1.0.2",
+        "lazy-val": "1.0.3",
         "node-emoji": "1.8.1",
         "semver": "5.4.1",
         "source-map-support": "0.5.0",
         "stat-mode": "0.2.2",
-        "temp-file": "2.0.3",
+        "temp-file": "3.0.0",
         "tunnel-agent": "0.6.0"
       },
       "dependencies": {
@@ -2262,7 +2147,7 @@
           "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
           "dev": true,
           "requires": {
-            "color-convert": "1.9.0"
+            "color-convert": "1.9.1"
           }
         },
         "chalk": {
@@ -2276,36 +2161,6 @@
             "supports-color": "4.5.0"
           }
         },
-        "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"
-          }
-        },
-        "has-flag": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-          "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
-          "dev": true
-        },
-        "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
-        },
-        "source-map-support": {
-          "version": "0.5.0",
-          "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.0.tgz",
-          "integrity": "sha512-vUoN3I7fHQe0R/SJLKRdKYuEdRGogsviXFkHHo17AWaTGv17VLnxw+CFXvqy+y4ORZ3doWLQcxRYfwKrsd/H7Q==",
-          "dev": true,
-          "requires": {
-            "source-map": "0.6.1"
-          }
-        },
         "supports-color": {
           "version": "4.5.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
@@ -2318,57 +2173,21 @@
       }
     },
     "builder-util-runtime": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-2.4.0.tgz",
-      "integrity": "sha512-35PskRowZnDnqJ6zbGSZ+ijndHPan2l56tF9n+FHMNmZnSQ69aw5eXWQDxyMlKKVwt/lF6dFGWhyRtsBmtDL7g==",
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-3.4.1.tgz",
+      "integrity": "sha512-I5fvn41z+vdjPvDZD6RigjyGyWQqjAh8Rs2IVbCI7HXlnEHkyT6Sl5fsS85eAjzs+huLzdbyABHz2CxGviPfWg==",
       "requires": {
         "bluebird-lst": "1.0.5",
         "debug": "3.1.0",
-        "fs-extra-p": "4.4.4",
+        "fs-extra-p": "4.5.0",
         "sax": "1.2.4"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "fs-extra": {
-          "version": "4.0.2",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.2.tgz",
-          "integrity": "sha1-+RcExT0bRh+JNFKwwwfZmXZHq2s=",
-          "requires": {
-            "graceful-fs": "4.1.11",
-            "jsonfile": "4.0.0",
-            "universalify": "0.1.1"
-          }
-        },
-        "fs-extra-p": {
-          "version": "4.4.4",
-          "resolved": "https://registry.npmjs.org/fs-extra-p/-/fs-extra-p-4.4.4.tgz",
-          "integrity": "sha512-zHsMNJWhXD184QfHKEIFSQSgAFNV7v9J+Nt2XpaLZp2nTz6WxZNV+R4G2uYeGeLTMaKvUZiqGKrH/4iFCupcUA==",
-          "requires": {
-            "bluebird-lst": "1.0.5",
-            "fs-extra": "4.0.2"
-          }
-        },
-        "jsonfile": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-          "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
-          "requires": {
-            "graceful-fs": "4.1.11"
-          }
-        }
       }
     },
     "builtin-modules": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
-      "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8="
+      "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
+      "dev": true
     },
     "builtin-status-codes": {
       "version": "3.0.0",
@@ -2382,6 +2201,27 @@
       "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=",
       "dev": true
     },
+    "cacache": {
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-10.0.1.tgz",
+      "integrity": "sha512-dRHYcs9LvG9cHgdPzjiI+/eS7e1xRhULrcyOx04RZQsszNJXU2SL9CyG60yLnge282Qq5nwTv+ieK2fH+WPZmA==",
+      "dev": true,
+      "requires": {
+        "bluebird": "3.5.1",
+        "chownr": "1.0.1",
+        "glob": "7.1.2",
+        "graceful-fs": "4.1.11",
+        "lru-cache": "4.1.1",
+        "mississippi": "1.3.0",
+        "mkdirp": "0.5.1",
+        "move-concurrently": "1.0.1",
+        "promise-inflight": "1.0.1",
+        "rimraf": "2.6.2",
+        "ssri": "5.0.0",
+        "unique-filename": "1.1.0",
+        "y18n": "3.2.1"
+      }
+    },
     "caller-path": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz",
@@ -2408,10 +2248,9 @@
       }
     },
     "camelcase": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
-      "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
-      "dev": true
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+      "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0="
     },
     "camelcase-keys": {
       "version": "2.1.0",
@@ -2421,6 +2260,14 @@
       "requires": {
         "camelcase": "2.1.1",
         "map-obj": "1.0.1"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
+          "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
+          "dev": true
+        }
       }
     },
     "caniuse-api": {
@@ -2430,15 +2277,15 @@
       "dev": true,
       "requires": {
         "browserslist": "1.7.7",
-        "caniuse-db": "1.0.30000726",
+        "caniuse-db": "1.0.30000784",
         "lodash.memoize": "4.1.2",
         "lodash.uniq": "4.5.0"
       }
     },
     "caniuse-db": {
-      "version": "1.0.30000726",
-      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000726.tgz",
-      "integrity": "sha1-m7dC+NAmpi34c7wDwGhD0iVbYNc=",
+      "version": "1.0.30000784",
+      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000784.tgz",
+      "integrity": "sha1-G+lQEtlInHcZB0+BruV9vf/mNhs=",
       "dev": true
     },
     "capture-stack-trace": {
@@ -2489,6 +2336,12 @@
         "supports-color": "2.0.0"
       }
     },
+    "chardet": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz",
+      "integrity": "sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I=",
+      "dev": true
+    },
     "chokidar": {
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz",
@@ -2535,9 +2388,9 @@
       "dev": true
     },
     "ci-info": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.1.1.tgz",
-      "integrity": "sha512-vHDDF/bP9RYpTWtUhpJRhCFdvvp3iDWvEbuDbWgvjUrNGV1MXJrE0MPcwGtEled04m61iwdBLUIHZtDgzWS4ZQ==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.1.2.tgz",
+      "integrity": "sha512-uTGIPNx/nSpBdsF6xnseRXLLtfr9VLqkz8ZqHXr3Y7b6SftyRxBGjwMtJj1OhNbmlc1wZzLNAlAcvyIiE8a6ZA==",
       "dev": true
     },
     "cipher-base": {
@@ -2557,21 +2410,29 @@
       "dev": true
     },
     "clap": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/clap/-/clap-1.2.0.tgz",
-      "integrity": "sha1-WckP4+E3EEdG/xlGmiemNP9oyFc=",
+      "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"
       }
     },
     "clean-css": {
-      "version": "4.1.8",
-      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.1.8.tgz",
-      "integrity": "sha1-BhRVsklKdQrJj0bY1euxfGeeqdE=",
+      "version": "4.1.9",
+      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.1.9.tgz",
+      "integrity": "sha1-Nc7ornaHpJuYA09w3gDE7dOCYwE=",
       "dev": true,
       "requires": {
         "source-map": "0.5.7"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true
+        }
       }
     },
     "cli-boxes": {
@@ -2603,13 +2464,24 @@
         "string-width": "1.0.2",
         "strip-ansi": "3.0.1",
         "wrap-ansi": "2.1.0"
+      },
+      "dependencies": {
+        "string-width": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+          "requires": {
+            "code-point-at": "1.1.0",
+            "is-fullwidth-code-point": "1.0.0",
+            "strip-ansi": "3.0.1"
+          }
+        }
       }
     },
     "clone": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz",
-      "integrity": "sha1-Jgt6meux7f4kdTgXX3gyQ8sZ0Uk=",
-      "dev": true
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.1.tgz",
+      "integrity": "sha1-0hfR6WERjjrJpLi7oyhVU79kfNs="
     },
     "clone-deep": {
       "version": "0.3.0",
@@ -2634,7 +2506,7 @@
       "integrity": "sha1-qe8VNmDWqGqL3sAomlxoTSF0Mv0=",
       "dev": true,
       "requires": {
-        "q": "1.5.0"
+        "q": "1.5.1"
       }
     },
     "code-point-at": {
@@ -2648,15 +2520,23 @@
       "integrity": "sha1-bXtcdPtl6EHNSHkq0e1eB7kE12Q=",
       "dev": true,
       "requires": {
-        "clone": "1.0.2",
-        "color-convert": "1.9.0",
+        "clone": "1.0.3",
+        "color-convert": "1.9.1",
         "color-string": "0.3.0"
+      },
+      "dependencies": {
+        "clone": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.3.tgz",
+          "integrity": "sha1-KY1+IjFmD0DAA8LtMUDezz9TCF8=",
+          "dev": true
+        }
       }
     },
     "color-convert": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz",
-      "integrity": "sha1-Gsz5fdc5uYO/mU1W/sj5WFNkG3o=",
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz",
+      "integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==",
       "dev": true,
       "requires": {
         "color-name": "1.1.3"
@@ -2756,13 +2636,16 @@
       }
     },
     "compression-webpack-plugin": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/compression-webpack-plugin/-/compression-webpack-plugin-1.0.1.tgz",
-      "integrity": "sha512-ABF2AFb31gpIBeEy/w6Ct0u+K+jY8jFRfGwjUWGxVTidA9pf7iH/JzjcVBQ+KB1gNMycujMxA56/PznMPUV5jw==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/compression-webpack-plugin/-/compression-webpack-plugin-1.1.3.tgz",
+      "integrity": "sha512-DIvTIkihu1tyoPdoan5Lh9GVvXgcNMDEgXSfyjlAriW3UaILoPhUFHFTU7Zsui+rPEexmFNlTyiLe0TCkQFJGg==",
       "dev": true,
       "requires": {
-        "async": "2.4.1",
-        "webpack-sources": "1.0.1"
+        "async": "2.6.0",
+        "cacache": "10.0.1",
+        "find-cache-dir": "1.0.0",
+        "serialize-javascript": "1.4.0",
+        "webpack-sources": "1.1.0"
       }
     },
     "concat-map": {
@@ -2779,54 +2662,22 @@
         "inherits": "2.0.3",
         "readable-stream": "2.3.3",
         "typedarray": "0.0.6"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "2.3.3",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-          "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "1.0.0",
-            "process-nextick-args": "1.0.7",
-            "safe-buffer": "5.1.1",
-            "string_decoder": "1.0.3",
-            "util-deprecate": "1.0.2"
-          }
-        },
-        "string_decoder": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-          "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "5.1.1"
-          }
-        }
       }
     },
     "concurrently": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-3.5.0.tgz",
-      "integrity": "sha1-jPG3cHppFqeKT/W3e7BN7FSzebI=",
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-3.5.1.tgz",
+      "integrity": "sha512-689HrwGw8Rbk1xtV9C4dY6TPJAvIYZbRbnKSAtfJ7tHqICFGoZ0PCWYjxfmerRyxBG0o3sbG3pe7N8vqPwIHuQ==",
       "dev": true,
       "requires": {
         "chalk": "0.5.1",
         "commander": "2.6.0",
-        "date-fns": "1.28.5",
+        "date-fns": "1.29.0",
         "lodash": "4.17.4",
         "rx": "2.3.24",
         "spawn-command": "0.0.2-1",
         "supports-color": "3.2.3",
-        "tree-kill": "1.1.0"
+        "tree-kill": "1.2.0"
       },
       "dependencies": {
         "ansi-regex": {
@@ -2871,6 +2722,12 @@
             "ansi-regex": "0.2.1"
           }
         },
+        "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
+        },
         "strip-ansi": {
           "version": "0.3.0",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
@@ -2899,16 +2756,16 @@
       "requires": {
         "dot-prop": "4.2.0",
         "graceful-fs": "4.1.11",
-        "make-dir": "1.0.0",
+        "make-dir": "1.1.0",
         "unique-string": "1.0.0",
         "write-file-atomic": "2.3.0",
         "xdg-basedir": "3.0.0"
       }
     },
     "connect-history-api-fallback": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.4.0.tgz",
-      "integrity": "sha1-PbJPlz9LkjsOgvYZzg3wJBHKYj0=",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz",
+      "integrity": "sha1-sGhzk0vF40T+9hGhlqb6rgruAVo=",
       "dev": true
     },
     "console-browserify": {
@@ -2951,9 +2808,9 @@
       "dev": true
     },
     "convert-source-map": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.0.tgz",
-      "integrity": "sha1-ms1whRxtXf3ZPZKC5e35SgP/RrU=",
+      "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
     },
     "cookie": {
@@ -2968,35 +2825,45 @@
       "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=",
       "dev": true
     },
+    "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.2.0",
+        "fs-write-stream-atomic": "1.0.10",
+        "iferr": "0.1.5",
+        "mkdirp": "0.5.1",
+        "rimraf": "2.6.2",
+        "run-queue": "1.0.3"
+      }
+    },
     "copy-webpack-plugin": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-4.2.0.tgz",
-      "integrity": "sha512-eZERim02YjJcepLjrToQMapOoRLfiXewJi9zJON6xXNNJSUhkGzL1L/yFjOufS0KxsnWUzc2szg9t8ZaZKJXAg==",
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-4.3.1.tgz",
+      "integrity": "sha512-xlcFiW/U7KrpS6dFuWq3r8Wb7koJx7QVc7LDFCosqkikaVSxkaYOnwDLwilbjrszZ0LYZXThDAJKcQCSrvdShQ==",
       "dev": true,
       "requires": {
-        "bluebird": "3.5.1",
-        "fs-extra": "4.0.2",
-        "glob": "7.1.2",
+        "cacache": "10.0.1",
+        "find-cache-dir": "1.0.0",
+        "globby": "7.1.1",
         "is-glob": "4.0.0",
         "loader-utils": "0.2.17",
         "lodash": "4.17.4",
         "minimatch": "3.0.4",
-        "node-dir": "0.1.17"
+        "p-limit": "1.1.0",
+        "pify": "3.0.0",
+        "serialize-javascript": "1.4.0"
       },
       "dependencies": {
-        "bluebird": {
-          "version": "3.5.1",
-          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
-          "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==",
-          "dev": true
-        },
         "loader-utils": {
           "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",
+            "big.js": "3.2.0",
             "emojis-list": "2.1.0",
             "json5": "0.5.1",
             "object-assign": "4.1.1"
@@ -3061,9 +2928,9 @@
       }
     },
     "cross-env": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.1.0.tgz",
-      "integrity": "sha512-R+0paw9UZQc7odHjIxElqyYotgyMlhcUMTfRxiv4I22grgvS5WOSSfCpyfAZUDhP/c9ShSRv+Hzfxs6fY4JA7g==",
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.1.3.tgz",
+      "integrity": "sha512-UOokgwvDzCT0mqRSLEkJzUhYXB1vK3E5UgDrD41QiXsm9UetcW2rCGHYz/O3p873lMJ1VZbFCF9Izkwh7nYR5A==",
       "dev": true,
       "requires": {
         "cross-spawn": "5.1.0",
@@ -3086,18 +2953,29 @@
       "integrity": "sha1-UYO8R6CVWb78+YzEZXlkmZNZNy8="
     },
     "cryptiles": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
-      "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz",
+      "integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=",
       "dev": true,
       "requires": {
-        "boom": "2.10.1"
+        "boom": "5.2.0"
+      },
+      "dependencies": {
+        "boom": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz",
+          "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==",
+          "dev": true,
+          "requires": {
+            "hoek": "4.2.0"
+          }
+        }
       }
     },
     "crypto-browserify": {
-      "version": "3.11.1",
-      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.11.1.tgz",
-      "integrity": "sha512-Na7ZlwCOqoaW5RwUK1WpXws2kv8mNhWdTlzob0UXulk6G9BDbyiJaGTYBIX61Ozn9l1EPPJpICZb4DaOpT9NlQ==",
+      "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",
@@ -3109,7 +2987,8 @@
         "inherits": "2.0.3",
         "pbkdf2": "3.0.14",
         "public-encrypt": "4.0.0",
-        "randombytes": "2.0.5"
+        "randombytes": "2.0.5",
+        "randomfill": "1.0.3"
       }
     },
     "crypto-random-string": {
@@ -3137,7 +3016,7 @@
         "loader-utils": "1.1.0",
         "lodash.camelcase": "4.3.0",
         "object-assign": "4.1.1",
-        "postcss": "5.2.17",
+        "postcss": "5.2.18",
         "postcss-modules-extract-imports": "1.1.0",
         "postcss-modules-local-by-default": "1.2.0",
         "postcss-modules-scope": "1.1.0",
@@ -3175,7 +3054,7 @@
           "integrity": "sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=",
           "dev": true,
           "requires": {
-            "regenerate": "1.3.2",
+            "regenerate": "1.3.3",
             "regjsgen": "0.2.0",
             "regjsparser": "0.1.5"
           }
@@ -3205,7 +3084,7 @@
         "defined": "1.0.0",
         "has": "1.0.1",
         "object-assign": "4.1.1",
-        "postcss": "5.2.17",
+        "postcss": "5.2.18",
         "postcss-calc": "5.3.1",
         "postcss-colormin": "2.2.2",
         "postcss-convert-values": "2.6.1",
@@ -3240,16 +3119,18 @@
       "integrity": "sha1-3dUsWHAz9J6Utx/FVWnyUuj/X4U=",
       "dev": true,
       "requires": {
-        "clap": "1.2.0",
+        "clap": "1.2.3",
         "source-map": "0.5.7"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true
+        }
       }
     },
-    "cuint": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/cuint/-/cuint-0.2.2.tgz",
-      "integrity": "sha1-QICG1AlVDCYxFVYZ6fp7ytw7mRs=",
-      "dev": true
-    },
     "currently-unhandled": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
@@ -3259,13 +3140,19 @@
         "array-find-index": "1.0.2"
       }
     },
+    "cyclist": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz",
+      "integrity": "sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=",
+      "dev": true
+    },
     "d": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz",
       "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
       "dev": true,
       "requires": {
-        "es5-ext": "0.10.35"
+        "es5-ext": "0.10.37"
       }
     },
     "damerau-levenshtein": {
@@ -3281,20 +3168,12 @@
       "dev": true,
       "requires": {
         "assert-plus": "1.0.0"
-      },
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-          "dev": true
-        }
       }
     },
     "date-fns": {
-      "version": "1.28.5",
-      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-1.28.5.tgz",
-      "integrity": "sha1-JXz8RdMi30XvVlhmWWfuhBzXP68=",
+      "version": "1.29.0",
+      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-1.29.0.tgz",
+      "integrity": "sha512-lbTXWZ6M20cWH8N9S6afb0SBm6tMk+uUg6z3MqHPKE9atmsY3kJkTm8vKe93izJ2B2+q5MV990sM2CHgtAZaOw==",
       "dev": true
     },
     "date-now": {
@@ -3304,10 +3183,9 @@
       "dev": true
     },
     "debug": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.0.1.tgz",
-      "integrity": "sha512-6nVc6S36qbt/mutyt+UGMnawAMrPDZUPQjRZI3FS9tCtDRhvxJbK79unYBLPi+z5SLXQ3ftoVBFCblQtNSls8w==",
-      "dev": true,
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+      "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
       "requires": {
         "ms": "2.0.0"
       }
@@ -3342,9 +3220,9 @@
       "dev": true
     },
     "deepmerge": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-2.0.0.tgz",
-      "integrity": "sha512-YiTeIE16rJ/BCCbWYueeQoKkhoolGHqynDZmB03gPqMt6y3duJG6+po7zdMm7UK5o3njDm4Yyuqr4082G4M4Zw=="
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-2.0.1.tgz",
+      "integrity": "sha512-VIPwiMJqJ13ZQfaCsIFnp5Me9tnjURiaIFxfz7EH0Ci0dTSQpZtSLrqOicXqEd/z2r+z+Klk9GzmnRsgpgbOsQ=="
     },
     "define-properties": {
       "version": "1.1.2",
@@ -3383,22 +3261,44 @@
         "pify": "2.3.0",
         "pinkie-promise": "2.0.1",
         "rimraf": "2.6.2"
-      }
-    },
-    "delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
-    },
-    "delegates": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
-      "dev": true
-    },
-    "depd": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz",
+      },
+      "dependencies": {
+        "globby": {
+          "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.2",
+            "arrify": "1.0.1",
+            "glob": "7.1.2",
+            "object-assign": "4.1.1",
+            "pify": "2.3.0",
+            "pinkie-promise": "2.0.1"
+          }
+        },
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        }
+      }
+    },
+    "delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
+    },
+    "delegates": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
+      "dev": true
+    },
+    "depd": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz",
       "integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k=",
       "dev": true
     },
@@ -3444,30 +3344,29 @@
         "randombytes": "2.0.5"
       }
     },
+    "dir-glob": {
+      "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"
+      }
+    },
     "dmg-builder": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-2.1.3.tgz",
-      "integrity": "sha512-3H0BNx62NzhTX/UuEf6GHRAl6moZvECufemxqgeByKs3o4ys6SNU+HynzppPTKZ5nNwx4EqcJXtAbhfPuMwHUQ==",
+      "version": "2.1.9",
+      "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-2.1.9.tgz",
+      "integrity": "sha512-PFt5VWLl+D+8VhnJAJFqMGkXIkn6VnRXnnFfN8UZV9Gcn0I0dArV7ENJEK+kUPpFpWm04LbjJBCkqvy/MhcmsQ==",
       "dev": true,
       "requires": {
         "bluebird-lst": "1.0.5",
-        "builder-util": "3.1.0",
+        "builder-util": "3.4.4",
         "debug": "3.1.0",
-        "fs-extra-p": "4.4.4",
+        "fs-extra-p": "4.5.0",
         "iconv-lite": "0.4.19",
         "js-yaml": "3.10.0",
         "parse-color": "1.0.0"
-      },
-      "dependencies": {
-        "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"
-          }
-        }
       }
     },
     "dns-equal": {
@@ -3496,21 +3395,12 @@
       }
     },
     "doctrine": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.0.0.tgz",
-      "integrity": "sha1-xz2NKQnSIpHhoAejlYBNqLZl/mM=",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.0.2.tgz",
+      "integrity": "sha512-y0tm5Pq6ywp3qSTZ1vPgVdAnbDEoeoc5wlOHXoY1c4Wug/a7JvqHIl7BTvwodaHmejWkK/9dSb3sCYfyo/om8A==",
       "dev": true,
       "requires": {
-        "esutils": "2.0.2",
-        "isarray": "1.0.0"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
-        }
+        "esutils": "2.0.2"
       }
     },
     "dom-converter": {
@@ -3531,9 +3421,9 @@
       }
     },
     "dom-helpers": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-3.2.1.tgz",
-      "integrity": "sha1-MgPgf+0he9H0JLAZc1WC/Deyglo="
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-3.3.1.tgz",
+      "integrity": "sha512-2Sm+JaYn74OiTM2wHvxJOo3roiq/h25Yi69Fqk269cNUwIXsCvATB6CRSFC9Am/20G2b28hGv/+7NiWydIrPvg=="
     },
     "dom-serializer": {
       "version": "0.1.0",
@@ -3581,9 +3471,9 @@
       }
     },
     "dompurify": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-1.0.2.tgz",
-      "integrity": "sha512-3POD2YKOvoG/qI7e+IMUBAdKyN5CmeMyrFQu7rk92neduPFWl81/ramY6UrYkJInMUTBwzqw0QS5GEr27kmV4A=="
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-1.0.3.tgz",
+      "integrity": "sha512-7dks9EA59zmQ9UBH7QJmGCHNxGJ7chzB5RJObT+h/TGBDtp4pTgunOeT0NidTA5MAq22muWrW3XfqtpvIsoSmw=="
     },
     "domutils": {
       "version": "1.5.1",
@@ -3628,6 +3518,18 @@
       "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=",
       "dev": true
     },
+    "duplexify": {
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.1.tgz",
+      "integrity": "sha512-j5goxHTwVED1Fpe5hh3q9R93Kip0Bg2KVAt4f8CEYM3UEwYcPSvWbXaUQOzdX/HtiNomipv+gU7ASQPDbV7pGQ==",
+      "dev": true,
+      "requires": {
+        "end-of-stream": "1.4.0",
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.3",
+        "stream-shift": "1.0.0"
+      }
+    },
     "ecc-jsbn": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
@@ -3651,51 +3553,33 @@
       "dev": true
     },
     "electron": {
-      "version": "1.7.9",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-1.7.9.tgz",
-      "integrity": "sha1-rdVOn4+D7QL2UZ7BATX2mLGTNs8=",
+      "version": "1.7.10",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-1.7.10.tgz",
+      "integrity": "sha1-Oj6D2WX9f6/kc76N349HJWG2JT0=",
       "dev": true,
       "requires": {
-        "@types/node": "7.0.46",
+        "@types/node": "7.0.51",
         "electron-download": "3.3.0",
-        "extract-zip": "1.6.5"
+        "extract-zip": "1.6.6"
       }
     },
     "electron-builder": {
-      "version": "19.41.0",
-      "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-19.41.0.tgz",
-      "integrity": "sha512-ncvGpEJEZjvJLVi9dqi6pWR4pqaw2e99dKRiXlFmsFPQXpmlEQMEmP/S9yoJkb3RgOEzVRKFMHmtwvZ73LGD+g==",
+      "version": "19.49.2",
+      "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-19.49.2.tgz",
+      "integrity": "sha512-6MhtMM26T/3idK8MNP2WJYjtArwv9DGQw8Fc7YObM0b/VFUrTq/jkqno9tBGHCkSIy6BINKuP7Eh4s+LByML9g==",
       "dev": true,
       "requires": {
-        "7zip-bin": "2.2.7",
-        "app-package-builder": "1.3.1",
-        "asar-integrity": "0.2.3",
-        "async-exit-hook": "2.0.1",
         "bluebird-lst": "1.0.5",
-        "builder-util": "3.1.0",
-        "builder-util-runtime": "2.4.0",
+        "builder-util": "3.4.4",
+        "builder-util-runtime": "3.4.1",
         "chalk": "2.3.0",
-        "chromium-pickle-js": "0.2.0",
-        "cuint": "0.2.2",
-        "debug": "3.1.0",
-        "dmg-builder": "2.1.3",
-        "ejs": "2.5.7",
+        "electron-builder-lib": "19.49.2",
         "electron-download-tf": "4.3.4",
-        "electron-osx-sign": "0.4.7",
-        "electron-publish": "19.40.0",
-        "fs-extra-p": "4.4.4",
-        "hosted-git-info": "2.5.0",
+        "fs-extra-p": "4.5.0",
         "is-ci": "1.0.10",
-        "isbinaryfile": "3.0.2",
-        "js-yaml": "3.10.0",
-        "lazy-val": "1.0.2",
-        "minimatch": "3.0.4",
-        "normalize-package-data": "2.4.0",
-        "plist": "2.1.0",
-        "read-config-file": "1.2.0",
+        "lazy-val": "1.0.3",
+        "read-config-file": "1.2.1",
         "sanitize-filename": "1.6.1",
-        "semver": "5.4.1",
-        "temp-file": "2.0.3",
         "update-notifier": "2.3.0",
         "yargs": "10.0.3"
       },
@@ -3706,7 +3590,7 @@
           "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
           "dev": true,
           "requires": {
-            "color-convert": "1.9.0"
+            "color-convert": "1.9.1"
           }
         },
         "chalk": {
@@ -3720,15 +3604,6 @@
             "supports-color": "4.5.0"
           }
         },
-        "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"
-          }
-        },
         "electron-download-tf": {
           "version": "4.3.4",
           "resolved": "https://registry.npmjs.org/electron-download-tf/-/electron-download-tf-4.3.4.tgz",
@@ -3737,7 +3612,7 @@
           "requires": {
             "debug": "3.1.0",
             "env-paths": "1.0.0",
-            "fs-extra": "4.0.2",
+            "fs-extra": "4.0.3",
             "minimist": "1.2.0",
             "nugget": "2.0.1",
             "path-exists": "3.0.0",
@@ -3746,11 +3621,16 @@
             "sumchecker": "2.0.2"
           }
         },
-        "has-flag": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-          "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
-          "dev": true
+        "fs-extra": {
+          "version": "4.0.3",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz",
+          "integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "4.1.11",
+            "jsonfile": "4.0.0",
+            "universalify": "0.1.1"
+          }
         },
         "minimist": {
           "version": "1.2.0",
@@ -3789,10 +3669,44 @@
         }
       }
     },
+    "electron-builder-lib": {
+      "version": "19.49.2",
+      "resolved": "https://registry.npmjs.org/electron-builder-lib/-/electron-builder-lib-19.49.2.tgz",
+      "integrity": "sha512-QShp+Ff+kx6QOnPdqmoXnCwzw2rT+2oFDe9kKlCRk9+abvOdEaCn5TzRBhje+XLPV7NbmjpS+7U9sUS545uOZg==",
+      "dev": true,
+      "requires": {
+        "7zip-bin": "2.3.4",
+        "app-package-builder": "2.0.1",
+        "asar-integrity": "0.2.3",
+        "async-exit-hook": "2.0.1",
+        "bluebird-lst": "1.0.5",
+        "builder-util": "3.4.4",
+        "builder-util-runtime": "3.4.1",
+        "chromium-pickle-js": "0.2.0",
+        "debug": "3.1.0",
+        "dmg-builder": "2.1.9",
+        "ejs": "2.5.7",
+        "electron-osx-sign": "0.4.7",
+        "electron-publish": "19.49.0",
+        "fs-extra-p": "4.5.0",
+        "hosted-git-info": "2.5.0",
+        "is-ci": "1.0.10",
+        "isbinaryfile": "3.0.2",
+        "js-yaml": "3.10.0",
+        "lazy-val": "1.0.3",
+        "minimatch": "3.0.4",
+        "normalize-package-data": "2.4.0",
+        "plist": "2.1.0",
+        "read-config-file": "1.2.1",
+        "sanitize-filename": "1.6.1",
+        "semver": "5.4.1",
+        "temp-file": "3.0.0"
+      }
+    },
     "electron-devtools-installer": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/electron-devtools-installer/-/electron-devtools-installer-2.2.1.tgz",
-      "integrity": "sha1-C+tzzL9ly8TQnnBs69pjj4ObjFU=",
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/electron-devtools-installer/-/electron-devtools-installer-2.2.3.tgz",
+      "integrity": "sha512-KFVP2lt3guvhXsUKE3YxbddMOJtpdvTsWfloV/8395Df5Td9Z+YvNl8LFW864mVqdDJsiy2qQ8y95NT5C+avSA==",
       "requires": {
         "7zip": "0.0.6",
         "cross-unzip": "0.0.2",
@@ -3876,7 +3790,7 @@
       "integrity": "sha1-HXVkeoJ0jqzUi+pwYW7IP/rePuU=",
       "dev": true,
       "requires": {
-        "bluebird": "3.5.0",
+        "bluebird": "3.5.1",
         "compare-version": "0.1.2",
         "debug": "2.6.9",
         "isbinaryfile": "3.0.2",
@@ -3902,17 +3816,17 @@
       }
     },
     "electron-publish": {
-      "version": "19.40.0",
-      "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-19.40.0.tgz",
-      "integrity": "sha512-8SZOp+V3o65IYfKjOgkqis16uL3S6gQLK08MYs9ceGelQ5IEvC69lJslk0hCTAxwfczH6eL7QlGS3A/zAyWsbQ==",
+      "version": "19.49.0",
+      "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-19.49.0.tgz",
+      "integrity": "sha512-JeO5zpKZMn1eoKhzL5SqDZ/uo8ia2Tt5rAzO+v3VRAXa01ljkBUUKsNftsmVGUgm2KiQ9d8ECFs5/fgE6WlgdQ==",
       "dev": true,
       "requires": {
         "bluebird-lst": "1.0.5",
-        "builder-util": "3.1.0",
-        "builder-util-runtime": "2.4.0",
-        "chalk": "2.1.0",
-        "fs-extra-p": "4.4.4",
-        "mime": "2.0.3"
+        "builder-util": "3.4.4",
+        "builder-util-runtime": "3.4.1",
+        "chalk": "2.3.0",
+        "fs-extra-p": "4.5.0",
+        "mime": "2.1.0"
       },
       "dependencies": {
         "ansi-styles": {
@@ -3921,13 +3835,13 @@
           "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
           "dev": true,
           "requires": {
-            "color-convert": "1.9.0"
+            "color-convert": "1.9.1"
           }
         },
         "chalk": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz",
-          "integrity": "sha512-LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ==",
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
+          "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
           "dev": true,
           "requires": {
             "ansi-styles": "3.2.0",
@@ -3935,12 +3849,6 @@
             "supports-color": "4.5.0"
           }
         },
-        "has-flag": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-          "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
-          "dev": true
-        },
         "supports-color": {
           "version": "4.5.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
@@ -3952,101 +3860,44 @@
         }
       }
     },
+    "electron-releases": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/electron-releases/-/electron-releases-2.1.0.tgz",
+      "integrity": "sha512-cyKFD1bTE/UgULXfaueIN1k5EPFzs+FRc/rvCY5tIynefAPqopQEgjr0EzY+U3Dqrk/G4m9tXSPuZ77v6dL/Rw==",
+      "dev": true
+    },
     "electron-settings": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/electron-settings/-/electron-settings-3.1.3.tgz",
-      "integrity": "sha512-tJQqVRwNmwSRWcYYz31KZQ46Hzt1WYvT7bg650hZGZtJfQqG6TDA8vceMyVA2Dvx0GRY6+vwJ/9zvZTINSfMBQ==",
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/electron-settings/-/electron-settings-3.1.4.tgz",
+      "integrity": "sha512-5AVJGE7+5Fwbui3PKs365vp/vGVpGGXlN1elBx/hAXVazmAtbY2jS0DOD7fBsVxzgCUiRCtR3tQvTF4cYLq/Sw==",
       "requires": {
         "clone": "2.1.1",
         "jsonfile": "4.0.0"
-      },
-      "dependencies": {
-        "clone": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.1.tgz",
-          "integrity": "sha1-0hfR6WERjjrJpLi7oyhVU79kfNs="
-        },
-        "jsonfile": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-          "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
-          "requires": {
-            "graceful-fs": "4.1.11"
-          }
-        }
       }
     },
     "electron-to-chromium": {
-      "version": "1.3.21",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.21.tgz",
-      "integrity": "sha1-qWfr3P6O0Ag/wkTRiUAiqOgRPqI=",
-      "dev": true
+      "version": "1.3.30",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.30.tgz",
+      "integrity": "sha512-zx1Prv7kYLfc4OA60FhxGbSo4qrEjgSzpo1/37i7l9ltXPYOoQBtjQxY9KmsgfHnBxHlBGXwLlsbt/gub1w5lw==",
+      "dev": true,
+      "requires": {
+        "electron-releases": "2.1.0"
+      }
     },
     "electron-updater": {
-      "version": "2.15.0",
-      "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-2.15.0.tgz",
-      "integrity": "sha512-xHGUPJav7EOKrEs/Tdlv6HFhtzkDfemLKew+S4iIjXyGPuV8hg7bFnbrHdOXid1iQF6ZE2QiNa1iT1Or2gnZsQ==",
+      "version": "2.17.6",
+      "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-2.17.6.tgz",
+      "integrity": "sha512-2xU544Ha0OXSMhypC4+EMfD+8rUH47OQ3UYGXJJjIaQNdIVF17EDoftsgoTAbL3N4axaPYBCPOiuEowyvFzNlw==",
       "requires": {
         "bluebird-lst": "1.0.5",
-        "builder-util-runtime": "2.4.0",
+        "builder-util-runtime": "3.4.1",
         "electron-is-dev": "0.3.0",
-        "fs-extra-p": "4.4.4",
+        "fs-extra-p": "4.5.0",
         "js-yaml": "3.10.0",
-        "lazy-val": "1.0.2",
+        "lazy-val": "1.0.3",
         "lodash.isequal": "4.5.0",
         "semver": "5.4.1",
         "source-map-support": "0.5.0"
-      },
-      "dependencies": {
-        "fs-extra": {
-          "version": "4.0.2",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.2.tgz",
-          "integrity": "sha1-+RcExT0bRh+JNFKwwwfZmXZHq2s=",
-          "requires": {
-            "graceful-fs": "4.1.11",
-            "jsonfile": "4.0.0",
-            "universalify": "0.1.1"
-          }
-        },
-        "fs-extra-p": {
-          "version": "4.4.4",
-          "resolved": "https://registry.npmjs.org/fs-extra-p/-/fs-extra-p-4.4.4.tgz",
-          "integrity": "sha512-zHsMNJWhXD184QfHKEIFSQSgAFNV7v9J+Nt2XpaLZp2nTz6WxZNV+R4G2uYeGeLTMaKvUZiqGKrH/4iFCupcUA==",
-          "requires": {
-            "bluebird-lst": "1.0.5",
-            "fs-extra": "4.0.2"
-          }
-        },
-        "js-yaml": {
-          "version": "3.10.0",
-          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz",
-          "integrity": "sha512-O2v52ffjLa9VeM43J4XocZE//WT9N0IiwDa3KSHH7Tu8CtH+1qM8SIZvnsTh6v+4yFy5KUY3BHUVwjpfAWsjIA==",
-          "requires": {
-            "argparse": "1.0.9",
-            "esprima": "4.0.0"
-          }
-        },
-        "jsonfile": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-          "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
-          "requires": {
-            "graceful-fs": "4.1.11"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-        },
-        "source-map-support": {
-          "version": "0.5.0",
-          "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.0.tgz",
-          "integrity": "sha512-vUoN3I7fHQe0R/SJLKRdKYuEdRGogsviXFkHHo17AWaTGv17VLnxw+CFXvqy+y4ORZ3doWLQcxRYfwKrsd/H7Q==",
-          "requires": {
-            "source-map": "0.6.1"
-          }
-        }
       }
     },
     "elliptic": {
@@ -4124,18 +3975,19 @@
       "dev": true
     },
     "errno": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.4.tgz",
-      "integrity": "sha1-uJbiOp5ei6M4cfyZar02NfyaHH0=",
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.6.tgz",
+      "integrity": "sha512-IsORQDpaaSwcDP4ZZnHxgE85werpo34VYn1Ud3mq+eUsF593faR8oCZNXrROVkpFu2TsbrNhHin0aUrTsQ9vNw==",
       "dev": true,
       "requires": {
-        "prr": "0.0.0"
+        "prr": "1.0.1"
       }
     },
     "error-ex": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz",
       "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=",
+      "dev": true,
       "requires": {
         "is-arrayish": "0.2.1"
       }
@@ -4150,9 +4002,9 @@
       }
     },
     "es-abstract": {
-      "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.8.2.tgz",
-      "integrity": "sha512-dvhwFL3yjQxNNsOWx6exMlaDrRHCRGMQlnx5lsXDCZ/J7G/frgIIl94zhZSp/galVAYp7VzPi1OrAHta89/yGQ==",
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.10.0.tgz",
+      "integrity": "sha512-/uh/DhdqIOSkAWifU+8nG78vlQxdLckUdI/sPgy0VhuXi2qJ7T8czBmqIYtLQVpCIFYafChnsRsB5pyb1JdmCQ==",
       "dev": true,
       "requires": {
         "es-to-primitive": "1.1.1",
@@ -4174,9 +4026,9 @@
       }
     },
     "es5-ext": {
-      "version": "0.10.35",
-      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.35.tgz",
-      "integrity": "sha1-GO6FjOajxFx9eekcFfzKnsVoSU8=",
+      "version": "0.10.37",
+      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.37.tgz",
+      "integrity": "sha1-DudB0Ui4AGm6J9AgOTdWryV978M=",
       "dev": true,
       "requires": {
         "es6-iterator": "2.0.3",
@@ -4190,7 +4042,7 @@
       "dev": true,
       "requires": {
         "d": "1.0.0",
-        "es5-ext": "0.10.35",
+        "es5-ext": "0.10.37",
         "es6-symbol": "3.1.1"
       }
     },
@@ -4201,7 +4053,7 @@
       "dev": true,
       "requires": {
         "d": "1.0.0",
-        "es5-ext": "0.10.35",
+        "es5-ext": "0.10.37",
         "es6-iterator": "2.0.3",
         "es6-set": "0.1.5",
         "es6-symbol": "3.1.1",
@@ -4209,9 +4061,9 @@
       }
     },
     "es6-promise": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.1.1.tgz",
-      "integrity": "sha512-OaU1hHjgJf+b0NzsxCg7NdIYERD6Hy/PEmFLTjw+b65scuisG3Kt4QoTvJ66BBkPZ581gr0kpoVzKnxniM8nng==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.2.tgz",
+      "integrity": "sha512-LSas5vsuA6Q4nEdf9wokY5/AJYXry98i0IzXsv49rYsgDGDNDPbqAYR1Pe23iFxygfbGZNR/5VrHXBCh2BhvUQ==",
       "dev": true
     },
     "es6-set": {
@@ -4221,7 +4073,7 @@
       "dev": true,
       "requires": {
         "d": "1.0.0",
-        "es5-ext": "0.10.35",
+        "es5-ext": "0.10.37",
         "es6-iterator": "2.0.3",
         "es6-symbol": "3.1.1",
         "event-emitter": "0.3.5"
@@ -4234,7 +4086,7 @@
       "dev": true,
       "requires": {
         "d": "1.0.0",
-        "es5-ext": "0.10.35"
+        "es5-ext": "0.10.37"
       }
     },
     "es6-weak-map": {
@@ -4244,7 +4096,7 @@
       "dev": true,
       "requires": {
         "d": "1.0.0",
-        "es5-ext": "0.10.35",
+        "es5-ext": "0.10.37",
         "es6-iterator": "2.0.3",
         "es6-symbol": "3.1.1"
       }
@@ -4274,33 +4126,33 @@
       }
     },
     "eslint": {
-      "version": "4.9.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-4.9.0.tgz",
-      "integrity": "sha1-doedJ0BoJhsZH+Dy9Wx0wvQgjos=",
+      "version": "4.14.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-4.14.0.tgz",
+      "integrity": "sha512-Ul6CSGRjKscEyg0X/EeNs7o2XdnbTEOD1OM8cTjmx85RPcBJQrEhZLevhuJZNAE/vS2iVl5Uhgiqf3h5uLMCJQ==",
       "dev": true,
       "requires": {
-        "ajv": "5.3.0",
+        "ajv": "5.5.2",
         "babel-code-frame": "6.26.0",
         "chalk": "2.3.0",
         "concat-stream": "1.6.0",
         "cross-spawn": "5.1.0",
-        "debug": "3.0.1",
-        "doctrine": "2.0.0",
+        "debug": "3.1.0",
+        "doctrine": "2.0.2",
         "eslint-scope": "3.7.1",
-        "espree": "3.5.1",
+        "eslint-visitor-keys": "1.0.0",
+        "espree": "3.5.2",
         "esquery": "1.0.0",
-        "estraverse": "4.2.0",
         "esutils": "2.0.2",
         "file-entry-cache": "2.0.0",
         "functional-red-black-tree": "1.0.1",
         "glob": "7.1.2",
-        "globals": "9.18.0",
-        "ignore": "3.3.6",
+        "globals": "11.1.0",
+        "ignore": "3.3.7",
         "imurmurhash": "0.1.4",
         "inquirer": "3.3.0",
-        "is-resolvable": "1.0.0",
+        "is-resolvable": "1.0.1",
         "js-yaml": "3.10.0",
-        "json-stable-stringify": "1.0.1",
+        "json-stable-stringify-without-jsonify": "1.0.1",
         "levn": "0.3.0",
         "lodash": "4.17.4",
         "minimatch": "3.0.4",
@@ -4318,18 +4170,6 @@
         "text-table": "0.2.0"
       },
       "dependencies": {
-        "ajv": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.3.0.tgz",
-          "integrity": "sha1-RBT/dKUIecII7l/cgm4ywwNUnto=",
-          "dev": true,
-          "requires": {
-            "co": "4.6.0",
-            "fast-deep-equal": "1.0.0",
-            "fast-json-stable-stringify": "2.0.0",
-            "json-schema-traverse": "0.3.1"
-          }
-        },
         "ansi-regex": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
@@ -4342,7 +4182,7 @@
           "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
           "dev": true,
           "requires": {
-            "color-convert": "1.9.0"
+            "color-convert": "1.9.1"
           }
         },
         "chalk": {
@@ -4356,10 +4196,10 @@
             "supports-color": "4.5.0"
           }
         },
-        "has-flag": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-          "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
+        "globals": {
+          "version": "11.1.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-11.1.0.tgz",
+          "integrity": "sha512-uEuWt9mqTlPDwSqi+sHjD4nWU/1N+q0fiWI9T1mZpD2UENqX20CFD5T/ziLZvztPaBKl7ZylUi1q6Qfm7E2CiQ==",
           "dev": true
         },
         "strip-ansi": {
@@ -4383,23 +4223,21 @@
       }
     },
     "eslint-config-airbnb": {
-      "version": "15.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-airbnb/-/eslint-config-airbnb-15.1.0.tgz",
-      "integrity": "sha512-m0q9fiMBzDAIbirlGnpJNWToIhdhJmXXnMG+IFflYzzod9231ZhtmGKegKg8E9T8F1YuVaDSU1FnCm5b9iXVhQ==",
+      "version": "16.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-airbnb/-/eslint-config-airbnb-16.1.0.tgz",
+      "integrity": "sha512-zLyOhVWhzB/jwbz7IPSbkUuj7X2ox4PHXTcZkEmDqTvd0baJmJyuxlFPDlZOE/Y5bC+HQRaEkT3FoHo9wIdRiw==",
       "dev": true,
       "requires": {
-        "eslint-config-airbnb-base": "11.3.2"
-      },
-      "dependencies": {
-        "eslint-config-airbnb-base": {
-          "version": "11.3.2",
-          "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-11.3.2.tgz",
-          "integrity": "sha512-/fhjt/VqzBA2SRsx7ErDtv6Ayf+XLw9LIOqmpBuHFCVwyJo2EtzGWMB9fYRFBoWWQLxmNmCpenNiH0RxyeS41w==",
-          "dev": true,
-          "requires": {
-            "eslint-restricted-globals": "0.1.1"
-          }
-        }
+        "eslint-config-airbnb-base": "12.1.0"
+      }
+    },
+    "eslint-config-airbnb-base": {
+      "version": "12.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-12.1.0.tgz",
+      "integrity": "sha512-/vjm0Px5ZCpmJqnjIzcFb9TKZrKWz0gnuG/7Gfkt0Db1ELJR51xkZth+t14rYdqWgX836XbuxtArbIHlVhbLBA==",
+      "dev": true,
+      "requires": {
+        "eslint-restricted-globals": "0.1.1"
       }
     },
     "eslint-import-resolver-node": {
@@ -4536,6 +4374,12 @@
             "pify": "2.3.0"
           }
         },
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        },
         "read-pkg": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
@@ -4566,9 +4410,9 @@
       }
     },
     "eslint-plugin-jsx-a11y": {
-      "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=",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.0.3.tgz",
+      "integrity": "sha1-VFg9GuRCSDFi4EDhPMMYZUZRAOU=",
       "dev": true,
       "requires": {
         "aria-query": "0.7.0",
@@ -4577,30 +4421,19 @@
         "axobject-query": "0.1.0",
         "damerau-levenshtein": "1.0.4",
         "emoji-regex": "6.5.1",
-        "jsx-ast-utils": "1.4.1"
+        "jsx-ast-utils": "2.0.1"
       }
     },
     "eslint-plugin-react": {
-      "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.4.0.tgz",
-      "integrity": "sha512-tvjU9u3VqmW2vVuYnE8Qptq+6ji4JltjOjJ9u7VAOxVYkUkyBZWRvNYKbDv5fN+L6wiA+4we9+qQahZ0m63XEA==",
+      "version": "7.5.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.5.1.tgz",
+      "integrity": "sha512-YGSjB9Qu6QbVTroUZi66pYky3DfoIPLdHQ/wmrBGyBRnwxQsBXAov9j2rpXt/55i8nyMv6IRWJv2s4d4YnduzQ==",
       "dev": true,
       "requires": {
-        "doctrine": "2.0.0",
+        "doctrine": "2.0.2",
         "has": "1.0.1",
         "jsx-ast-utils": "2.0.1",
         "prop-types": "15.6.0"
-      },
-      "dependencies": {
-        "jsx-ast-utils": {
-          "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"
-          }
-        }
       }
     },
     "eslint-restricted-globals": {
@@ -4619,13 +4452,19 @@
         "estraverse": "4.2.0"
       }
     },
+    "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
+    },
     "espree": {
-      "version": "3.5.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.1.tgz",
-      "integrity": "sha1-DJiLirRttTEAoZVK5LqZXd0n2H4=",
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.2.tgz",
+      "integrity": "sha512-sadKeYwaR/aJ3stC2CdvgXu1T16TdYN+qwCpcWbMnGJ8s0zNWemzrvb2GbD4OhmJ/fwpJjudThAlLobGbWZbCQ==",
       "dev": true,
       "requires": {
-        "acorn": "5.1.2",
+        "acorn": "5.2.1",
         "acorn-jsx": "3.0.1"
       }
     },
@@ -4678,7 +4517,7 @@
       "dev": true,
       "requires": {
         "d": "1.0.0",
-        "es5-ext": "0.10.35"
+        "es5-ext": "0.10.37"
       }
     },
     "event-stream": {
@@ -4829,12 +4668,6 @@
           "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
           "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=",
           "dev": true
-        },
-        "qs": {
-          "version": "6.5.1",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz",
-          "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==",
-          "dev": true
         }
       }
     },
@@ -4845,13 +4678,13 @@
       "dev": true
     },
     "external-editor": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.0.5.tgz",
-      "integrity": "sha512-Msjo64WT5W+NhOpQXh0nOHm+n0RfU1QUwDnKYvJ8dEJ8zlwLrqXNTv5mSUTJpepf41PDJGyhueTw2vNZW+Fr/w==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.1.0.tgz",
+      "integrity": "sha512-E44iT5QVOUJBKij4IIV3uvxuNlbKS38Tw1HiupxEIHPv9qtC2PrDYohbXV5U+1jnfIXttny8gUhj+oZvflFlzA==",
       "dev": true,
       "requires": {
+        "chardet": "0.4.2",
         "iconv-lite": "0.4.19",
-        "jschardet": "1.5.1",
         "tmp": "0.0.33"
       }
     },
@@ -4878,31 +4711,31 @@
       "integrity": "sha512-bt/LZ4m5Rqt/Crl2HiKuAl/oqg0psx1tsTLkvWbJen1CtD+fftkZhMaQ9HOtY2gWsl2Wq+sABmMVi9z3DhKWQQ==",
       "dev": true,
       "requires": {
-        "async": "2.4.1",
+        "async": "2.6.0",
         "loader-utils": "1.1.0",
         "schema-utils": "0.3.0",
-        "webpack-sources": "1.0.1"
+        "webpack-sources": "1.1.0"
       }
     },
     "extract-zip": {
-      "version": "1.6.5",
-      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.5.tgz",
-      "integrity": "sha1-maBnNbbqIOqbcF13ms/8yHz/BEA=",
+      "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.2.0",
+        "debug": "2.6.9",
         "mkdirp": "0.5.0",
         "yauzl": "2.4.1"
       },
       "dependencies": {
         "debug": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
-          "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
           "dev": true,
           "requires": {
-            "ms": "0.7.1"
+            "ms": "2.0.0"
           }
         },
         "mkdirp": {
@@ -4913,12 +4746,6 @@
           "requires": {
             "minimist": "0.0.8"
           }
-        },
-        "ms": {
-          "version": "0.7.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
-          "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=",
-          "dev": true
         }
       }
     },
@@ -4961,6 +4788,20 @@
         "websocket-driver": "0.7.0"
       }
     },
+    "fbjs": {
+      "version": "0.8.16",
+      "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.16.tgz",
+      "integrity": "sha1-XmdDL1UNxBtXK/VYR7ispk5TN9s=",
+      "requires": {
+        "core-js": "1.2.7",
+        "isomorphic-fetch": "2.2.1",
+        "loose-envify": "1.3.1",
+        "object-assign": "4.1.1",
+        "promise": "7.3.1",
+        "setimmediate": "1.0.5",
+        "ua-parser-js": "0.7.17"
+      }
+    },
     "fd-slicer": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz",
@@ -5058,7 +4899,7 @@
       "dev": true,
       "requires": {
         "commondir": "1.0.1",
-        "make-dir": "1.0.0",
+        "make-dir": "1.1.0",
         "pkg-dir": "2.0.0"
       }
     },
@@ -5088,6 +4929,16 @@
       "integrity": "sha1-2uRqnXj74lKSJYzB54CkHZXAN4I=",
       "dev": true
     },
+    "flush-write-stream": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.2.tgz",
+      "integrity": "sha1-yBuQ2HRnZvGmCaRoCZRsRd2K5Bc=",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.3"
+      }
+    },
     "for-in": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
@@ -5143,7 +4994,17 @@
       "integrity": "sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=",
       "dev": true
     },
-    "front-matter": {
+    "from2": {
+      "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.3",
+        "readable-stream": "2.3.3"
+      }
+    },
+    "front-matter": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/front-matter/-/front-matter-2.1.2.tgz",
       "integrity": "sha1-91mDufL0E75ljJPf172M5AePXNs=",
@@ -5153,10 +5014,9 @@
       }
     },
     "fs-extra": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.2.tgz",
-      "integrity": "sha1-+RcExT0bRh+JNFKwwwfZmXZHq2s=",
-      "dev": true,
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz",
+      "integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==",
       "requires": {
         "graceful-fs": "4.1.11",
         "jsonfile": "4.0.0",
@@ -5164,13 +5024,24 @@
       }
     },
     "fs-extra-p": {
-      "version": "4.4.4",
-      "resolved": "https://registry.npmjs.org/fs-extra-p/-/fs-extra-p-4.4.4.tgz",
-      "integrity": "sha512-zHsMNJWhXD184QfHKEIFSQSgAFNV7v9J+Nt2XpaLZp2nTz6WxZNV+R4G2uYeGeLTMaKvUZiqGKrH/4iFCupcUA==",
-      "dev": true,
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/fs-extra-p/-/fs-extra-p-4.5.0.tgz",
+      "integrity": "sha512-V/sdZmV+Yx3+nfXmjRTdBP4mVWCt7hZ0+ZOv+IZo+6fdkBxafaGsI7mYeNv/J3rWyz+mIToCFQORFSwt1bZw8Q==",
       "requires": {
         "bluebird-lst": "1.0.5",
-        "fs-extra": "4.0.2"
+        "fs-extra": "5.0.0"
+      }
+    },
+    "fs-write-stream-atomic": {
+      "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.11",
+        "iferr": "0.1.5",
+        "imurmurhash": "0.1.4",
+        "readable-stream": "2.3.3"
       }
     },
     "fs.realpath": {
@@ -5213,7 +5084,7 @@
       "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
       "dev": true,
       "requires": {
-        "aproba": "1.1.2",
+        "aproba": "1.2.0",
         "console-control-strings": "1.1.0",
         "has-unicode": "2.0.1",
         "object-assign": "4.1.1",
@@ -5221,6 +5092,19 @@
         "string-width": "1.0.2",
         "strip-ansi": "3.0.1",
         "wide-align": "1.1.2"
+      },
+      "dependencies": {
+        "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.1.0",
+            "is-fullwidth-code-point": "1.0.0",
+            "strip-ansi": "3.0.1"
+          }
+        }
       }
     },
     "gaze": {
@@ -5270,14 +5154,6 @@
       "dev": true,
       "requires": {
         "assert-plus": "1.0.0"
-      },
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-          "dev": true
-        }
       }
     },
     "github-from-package": {
@@ -5363,12 +5239,12 @@
       }
     },
     "global-dirs": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.0.tgz",
-      "integrity": "sha1-ENNAOeDfBCcuJizyQiT3IJQ0308=",
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz",
+      "integrity": "sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=",
       "dev": true,
       "requires": {
-        "ini": "1.3.4"
+        "ini": "1.3.5"
       }
     },
     "globals": {
@@ -5378,17 +5254,17 @@
       "dev": true
     },
     "globby": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz",
-      "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz",
+      "integrity": "sha1-+yzP+UAfhgCUXfral0QMypcrhoA=",
       "dev": true,
       "requires": {
         "array-union": "1.0.2",
-        "arrify": "1.0.1",
+        "dir-glob": "2.0.0",
         "glob": "7.1.2",
-        "object-assign": "4.1.1",
-        "pify": "2.3.0",
-        "pinkie-promise": "2.0.1"
+        "ignore": "3.3.7",
+        "pify": "3.0.0",
+        "slash": "1.0.0"
       }
     },
     "globule": {
@@ -5463,19 +5339,19 @@
       "dev": true
     },
     "har-schema": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz",
-      "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
       "dev": true
     },
     "har-validator": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz",
-      "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=",
+      "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": "4.11.8",
-        "har-schema": "1.0.5"
+        "ajv": "5.5.2",
+        "har-schema": "2.0.0"
       }
     },
     "has": {
@@ -5497,9 +5373,9 @@
       }
     },
     "has-flag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-      "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
+      "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
       "dev": true
     },
     "has-unicode": {
@@ -5528,15 +5404,15 @@
       }
     },
     "hawk": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
-      "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz",
+      "integrity": "sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==",
       "dev": true,
       "requires": {
-        "boom": "2.10.1",
-        "cryptiles": "2.0.5",
-        "hoek": "2.16.3",
-        "sntp": "1.0.9"
+        "boom": "4.3.1",
+        "cryptiles": "3.1.2",
+        "hoek": "4.2.0",
+        "sntp": "2.1.0"
       }
     },
     "he": {
@@ -5569,9 +5445,9 @@
       }
     },
     "hoek": {
-      "version": "2.16.3",
-      "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
-      "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz",
+      "integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ==",
       "dev": true
     },
     "hoist-non-react-statics": {
@@ -5598,7 +5474,8 @@
     "hosted-git-info": {
       "version": "2.5.0",
       "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz",
-      "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg=="
+      "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg==",
+      "dev": true
     },
     "hpack.js": {
       "version": "2.1.6",
@@ -5610,38 +5487,6 @@
         "obuf": "1.1.1",
         "readable-stream": "2.3.3",
         "wbuf": "1.7.2"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "2.3.3",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-          "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "1.0.0",
-            "process-nextick-args": "1.0.7",
-            "safe-buffer": "5.1.1",
-            "string_decoder": "1.0.3",
-            "util-deprecate": "1.0.2"
-          }
-        },
-        "string_decoder": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-          "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "5.1.1"
-          }
-        }
       }
     },
     "html-comment-regex": {
@@ -5657,25 +5502,25 @@
       "dev": true
     },
     "html-minifier": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.3.tgz",
-      "integrity": "sha512-iKRzQQDuTCsq0Ultbi/mfJJnR0D3AdZKTq966Gsp92xkmAPCV4Xi08qhJ0Dl3ZAWemSgJ7qZK+UsZc0gFqK6wg==",
+      "version": "3.5.8",
+      "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.8.tgz",
+      "integrity": "sha512-WX7D6PB9PFq05fZ1/CyxPUuyqXed6vh2fGOM80+zJT5wAO93D/cUjLs0CcbBFjQmlwmCgRvl97RurtArIpOnkw==",
       "dev": true,
       "requires": {
         "camel-case": "3.0.0",
-        "clean-css": "4.1.8",
-        "commander": "2.11.0",
+        "clean-css": "4.1.9",
+        "commander": "2.12.2",
         "he": "1.1.1",
         "ncname": "1.0.0",
         "param-case": "2.1.1",
         "relateurl": "0.2.7",
-        "uglify-js": "3.0.28"
+        "uglify-js": "3.3.2"
       },
       "dependencies": {
         "commander": {
-          "version": "2.11.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz",
-          "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==",
+          "version": "2.12.2",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.12.2.tgz",
+          "integrity": "sha512-BFnaq5ZOGcDN7FlrtBT4xxkgIToalIIxwjxLWVJ8bGTpe1LroqMiqQXdA7ygc7CRvaYS+9zfPGFnJqFSayx+AA==",
           "dev": true
         }
       }
@@ -5686,12 +5531,12 @@
       "integrity": "sha1-f5xCG36pHsRg9WUn1430hO51N9U=",
       "dev": true,
       "requires": {
-        "bluebird": "3.5.0",
-        "html-minifier": "3.5.3",
+        "bluebird": "3.5.1",
+        "html-minifier": "3.5.8",
         "loader-utils": "0.2.17",
         "lodash": "4.17.4",
         "pretty-error": "2.1.1",
-        "toposort": "1.0.3"
+        "toposort": "1.0.6"
       },
       "dependencies": {
         "loader-utils": {
@@ -5700,7 +5545,7 @@
           "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=",
           "dev": true,
           "requires": {
-            "big.js": "3.1.3",
+            "big.js": "3.2.0",
             "emojis-list": "2.1.0",
             "json5": "0.5.1",
             "object-assign": "4.1.1"
@@ -5740,6 +5585,12 @@
             "isarray": "0.0.1",
             "string_decoder": "0.10.31"
           }
+        },
+        "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
         }
       }
     },
@@ -5809,20 +5660,20 @@
       }
     },
     "http-signature": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
-      "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
+      "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": "0.2.0",
+        "assert-plus": "1.0.0",
         "jsprim": "1.4.1",
         "sshpk": "1.13.1"
       }
     },
     "https-browserify": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz",
-      "integrity": "sha1-P5E2XKvmC3ftDruiS0VOPgnZWoI=",
+      "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
     },
     "iconv-lite": {
@@ -5842,7 +5693,7 @@
       "integrity": "sha1-g/Cg7DeL8yRheLbCrZE28TWxyWI=",
       "dev": true,
       "requires": {
-        "postcss": "6.0.11"
+        "postcss": "6.0.14"
       },
       "dependencies": {
         "ansi-styles": {
@@ -5851,41 +5702,35 @@
           "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
           "dev": true,
           "requires": {
-            "color-convert": "1.9.0"
+            "color-convert": "1.9.1"
           }
         },
         "chalk": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz",
-          "integrity": "sha512-LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ==",
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
+          "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
           "dev": true,
           "requires": {
             "ansi-styles": "3.2.0",
             "escape-string-regexp": "1.0.5",
-            "supports-color": "4.4.0"
+            "supports-color": "4.5.0"
           }
         },
-        "has-flag": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-          "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
-          "dev": true
-        },
         "postcss": {
-          "version": "6.0.11",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.11.tgz",
-          "integrity": "sha512-DsnIzznNRQprsGTALpkC0xjDygo+QcOd+qVjP9+RjyzrPiyYOXBGOwoJ4rAiiE4lu6JggQ/jW4niY24WLxuncg==",
+          "version": "6.0.14",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.14.tgz",
+          "integrity": "sha512-NJ1z0f+1offCgadPhz+DvGm5Mkci+mmV5BqD13S992o0Xk9eElxUfPPF+t2ksH5R/17gz4xVK8KWocUQ5o3Rog==",
           "dev": true,
           "requires": {
-            "chalk": "2.1.0",
-            "source-map": "0.5.7",
-            "supports-color": "4.4.0"
+            "chalk": "2.3.0",
+            "source-map": "0.6.1",
+            "supports-color": "4.5.0"
           }
         },
         "supports-color": {
-          "version": "4.4.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz",
-          "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==",
+          "version": "4.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
+          "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
           "dev": true,
           "requires": {
             "has-flag": "2.0.0"
@@ -5899,10 +5744,16 @@
       "integrity": "sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q=",
       "dev": true
     },
+    "iferr": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz",
+      "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=",
+      "dev": true
+    },
     "ignore": {
-      "version": "3.3.6",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.6.tgz",
-      "integrity": "sha512-HrxmNxKTGZ9a3uAl/FNG66Sdt0G9L4TtMbbUQjP1WhGmSj0FOyHvSgx7623aGJvXfPOur8MwmarlHT+37jmzlw==",
+      "version": "3.3.7",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.7.tgz",
+      "integrity": "sha512-YGG3ejvBNHRqu0559EOxxNFihD0AjpvHlC/pdGKd3X3ofe+CoJkYazwNJYTNebqpPKN+VVQbh4ZFn1DivMNuHA==",
       "dev": true
     },
     "import-lazy": {
@@ -5969,9 +5820,9 @@
       "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
     },
     "ini": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz",
-      "integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4=",
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
+      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
       "dev": true
     },
     "inquirer": {
@@ -5984,7 +5835,7 @@
         "chalk": "2.3.0",
         "cli-cursor": "2.1.0",
         "cli-width": "2.2.0",
-        "external-editor": "2.0.5",
+        "external-editor": "2.1.0",
         "figures": "2.0.0",
         "lodash": "4.17.4",
         "mute-stream": "0.0.7",
@@ -6008,7 +5859,7 @@
           "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
           "dev": true,
           "requires": {
-            "color-convert": "1.9.0"
+            "color-convert": "1.9.1"
           }
         },
         "chalk": {
@@ -6022,28 +5873,6 @@
             "supports-color": "4.5.0"
           }
         },
-        "has-flag": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-          "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-          "dev": true
-        },
-        "string-width": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-          "dev": true,
-          "requires": {
-            "is-fullwidth-code-point": "2.0.0",
-            "strip-ansi": "4.0.0"
-          }
-        },
         "strip-ansi": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
@@ -6065,9 +5894,9 @@
       }
     },
     "int64-buffer": {
-      "version": "0.1.9",
-      "resolved": "https://registry.npmjs.org/int64-buffer/-/int64-buffer-0.1.9.tgz",
-      "integrity": "sha1-ngOdoEOyT3ixlrKD4EZT716ZD2E=",
+      "version": "0.1.10",
+      "resolved": "https://registry.npmjs.org/int64-buffer/-/int64-buffer-0.1.10.tgz",
+      "integrity": "sha1-J3siiofZWtd30HwTgyAiQGpHNCM=",
       "dev": true
     },
     "internal-ip": {
@@ -6080,9 +5909,9 @@
       }
     },
     "interpret": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.0.4.tgz",
-      "integrity": "sha1-ggzdWIuGj/sZGoCVBtbJyPISsbA=",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz",
+      "integrity": "sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=",
       "dev": true
     },
     "invariant": {
@@ -6119,7 +5948,8 @@
     "is-arrayish": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0="
+      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
+      "dev": true
     },
     "is-binary-path": {
       "version": "1.0.1",
@@ -6127,19 +5957,20 @@
       "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
       "dev": true,
       "requires": {
-        "binary-extensions": "1.10.0"
+        "binary-extensions": "1.11.0"
       }
     },
     "is-buffer": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz",
-      "integrity": "sha1-Hzsm72E7IUuIy8ojzGwB2Hlh7sw=",
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
       "dev": true
     },
     "is-builtin-module": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
       "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
+      "dev": true,
       "requires": {
         "builtin-modules": "1.1.1"
       }
@@ -6156,7 +5987,7 @@
       "integrity": "sha1-9zkzayYyNlBhqdSCcM1WrjNpMY4=",
       "dev": true,
       "requires": {
-        "ci-info": "1.1.1"
+        "ci-info": "1.1.2"
       }
     },
     "is-date-object": {
@@ -6224,28 +6055,20 @@
       "integrity": "sha1-Df2Y9akRFxbdU13aZJL2e/PSWoA=",
       "dev": true,
       "requires": {
-        "global-dirs": "0.1.0",
-        "is-path-inside": "1.0.0"
+        "global-dirs": "0.1.1",
+        "is-path-inside": "1.0.1"
       }
     },
     "is-my-json-valid": {
-      "version": "2.16.1",
-      "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.1.tgz",
-      "integrity": "sha512-ochPsqWS1WXj8ZnMIV0vnNXooaMhp7cyL4FMSIPKTtnV0Ha/T19G2b9kkhcNsabV9bxYkze7/aLZJb/bYuFduQ==",
+      "version": "2.17.1",
+      "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.17.1.tgz",
+      "integrity": "sha512-Q2khNw+oBlWuaYvEEHtKSw/pCxD2L5Rc1C+UQme9X6JdRDh7m5D7HkozA0qa3DUkQ6VzCnEm8mVIQPyIRkI5sQ==",
       "dev": true,
       "requires": {
         "generate-function": "2.0.0",
         "generate-object-property": "1.2.0",
         "jsonpointer": "4.0.1",
         "xtend": "4.0.1"
-      },
-      "dependencies": {
-        "xtend": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-          "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
-          "dev": true
-        }
       }
     },
     "is-npm": {
@@ -6281,13 +6104,13 @@
       "integrity": "sha1-ZHdYK4IU1gI0YJRWcAO+ip6sBNw=",
       "dev": true,
       "requires": {
-        "is-path-inside": "1.0.0"
+        "is-path-inside": "1.0.1"
       }
     },
     "is-path-inside": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.0.tgz",
-      "integrity": "sha1-/AbloWg/vaE95mev9xe7wQpI838=",
+      "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.2"
@@ -6348,13 +6171,10 @@
       }
     },
     "is-resolvable": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.0.0.tgz",
-      "integrity": "sha1-jfV8YeouPFAUCNEA+wE8+NbgzGI=",
-      "dev": true,
-      "requires": {
-        "tryit": "1.0.3"
-      }
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.0.1.tgz",
+      "integrity": "sha512-y5CXYbzvB3jTnWAZH1Nl7ykUWb6T3BcTs56HUruwBf8MhF56n1HWqhDWnVFo8GHrUPDgvUUNVhrc2U8W7iqz5g==",
+      "dev": true
     },
     "is-retry-allowed": {
       "version": "1.1.0",
@@ -6449,9 +6269,9 @@
       "integrity": "sha1-XE2d5lKvbNCncBVKYxu6ErAVx4c="
     },
     "js-base64": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.2.0.tgz",
-      "integrity": "sha1-XoqNGTqQgZjdI9FwSCbSB7DlqPY=",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.4.0.tgz",
+      "integrity": "sha512-Wehd+7Pf9tFvGb+ydPm9TjYjV8X1YHOVyG8QyELZxEMqOhemVwGRmoG8iQ/soqI3n8v4xn59zaLxiCJiaaRzKA==",
       "dev": true
     },
     "js-tokens": {
@@ -6463,7 +6283,6 @@
       "version": "3.10.0",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz",
       "integrity": "sha512-O2v52ffjLa9VeM43J4XocZE//WT9N0IiwDa3KSHH7Tu8CtH+1qM8SIZvnsTh6v+4yFy5KUY3BHUVwjpfAWsjIA==",
-      "dev": true,
       "requires": {
         "argparse": "1.0.9",
         "esprima": "4.0.0"
@@ -6476,12 +6295,6 @@
       "dev": true,
       "optional": true
     },
-    "jschardet": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/jschardet/-/jschardet-1.5.1.tgz",
-      "integrity": "sha512-vE2hT1D0HLZCLLclfBSfkfTTedhVj0fubHpJBHKwwUWX0nSbhPAfk+SG9rTX95BYNmau8rGFfCeaT6T5OW1C2A==",
-      "dev": true
-    },
     "jsesc": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
@@ -6494,6 +6307,12 @@
       "integrity": "sha512-QLPs8Dj7lnf3e3QYS1zkCo+4ZwqOiF9d/nZnYozTISxXWCfNs9yuky5rJw4/W34s7POaNlbZmQGaB5NiXCbP4w==",
       "dev": true
     },
+    "json-parse-better-errors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.1.tgz",
+      "integrity": "sha512-xyQpxeWWMKyJps9CuGJYeng6ssI5bpqS9ltQpdVQ90t4ql6NdnxFKh95JcRt2cun/DjMVNrdjniLPuMA69xmCw==",
+      "dev": true
+    },
     "json-schema": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
@@ -6514,6 +6333,12 @@
         "jsonify": "0.0.0"
       }
     },
+    "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
+    },
     "json-stringify-safe": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
@@ -6536,7 +6361,6 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
       "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
-      "dev": true,
       "requires": {
         "graceful-fs": "4.1.11"
       }
@@ -6563,20 +6387,21 @@
         "extsprintf": "1.3.0",
         "json-schema": "0.2.3",
         "verror": "1.10.0"
-      },
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-          "dev": true
-        }
       }
     },
     "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=",
+      "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"
+      }
+    },
+    "killable": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.0.tgz",
+      "integrity": "sha1-2ouEvUfeU5WHj5XWTQLyRJ/gXms=",
       "dev": true
     },
     "kind-of": {
@@ -6585,7 +6410,7 @@
       "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
       "dev": true,
       "requires": {
-        "is-buffer": "1.1.5"
+        "is-buffer": "1.1.6"
       }
     },
     "klaw": {
@@ -6619,9 +6444,9 @@
       "dev": true
     },
     "lazy-val": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/lazy-val/-/lazy-val-1.0.2.tgz",
-      "integrity": "sha512-2BaSu6qVnicKdWQPysrffZVFAKcPcZQ/q2YyeSjAxWaJlvCvKSrkcvsSHlleeIfA//fW2goTcYDTy2cBLN7+PQ=="
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/lazy-val/-/lazy-val-1.0.3.tgz",
+      "integrity": "sha512-pjCf3BYk+uv3ZcPzEVM0BFvO9Uw58TmlrU0oG5tTrr9Kcid3+kdKxapH8CjdYmVa2nO5wOoZn2rdvZx2PKj/xg=="
     },
     "lcid": {
       "version": "1.0.0",
@@ -6652,6 +6477,14 @@
         "pify": "2.3.0",
         "pinkie-promise": "2.0.1",
         "strip-bom": "2.0.0"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        }
       }
     },
     "loader-runner": {
@@ -6666,7 +6499,7 @@
       "integrity": "sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=",
       "dev": true,
       "requires": {
-        "big.js": "3.1.3",
+        "big.js": "3.2.0",
         "emojis-list": "2.1.0",
         "json5": "0.5.1"
       }
@@ -6774,9 +6607,9 @@
       "dev": true
     },
     "loglevel": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.5.1.tgz",
-      "integrity": "sha1-GJB4yUq5BT7iFaCs2/JCROoPZQI=",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.0.tgz",
+      "integrity": "sha1-rgyqVhERSYxboTcj1vtjHSQAOTQ=",
       "dev": true
     },
     "longest": {
@@ -6831,12 +6664,12 @@
       "dev": true
     },
     "make-dir": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.0.0.tgz",
-      "integrity": "sha1-l6ARdR6R3YfPre9Ygy67BJNt6Xg=",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.1.0.tgz",
+      "integrity": "sha512-0Pkui4wLJ7rxvmfUvs87skoEaxmu0hCUApF8nonzpl7q//FWp9zu8W61Scz4sd/kUiqDxvUhtoam2efDyiBzcA==",
       "dev": true,
       "requires": {
-        "pify": "2.3.0"
+        "pify": "3.0.0"
       }
     },
     "map-obj": {
@@ -6899,64 +6732,15 @@
       "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
       "dev": true,
       "requires": {
-        "errno": "0.1.4",
+        "errno": "0.1.6",
         "readable-stream": "2.3.3"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "2.3.3",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-          "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "1.0.0",
-            "process-nextick-args": "1.0.7",
-            "safe-buffer": "5.1.1",
-            "string_decoder": "1.0.3",
-            "util-deprecate": "1.0.2"
-          }
-        },
-        "string_decoder": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-          "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "5.1.1"
-          }
-        }
       }
     },
-    "memory-streams": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/memory-streams/-/memory-streams-0.1.2.tgz",
-      "integrity": "sha1-Jz/3d6tg/sWZsRY1UlUoLMosUMI=",
-      "dev": true,
-      "requires": {
-        "readable-stream": "1.0.34"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "1.0.34",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-          "dev": true,
-          "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "0.0.1",
-            "string_decoder": "0.10.31"
-          }
-        }
-      }
+    "memorystream": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/memorystream/-/memorystream-0.3.1.tgz",
+      "integrity": "sha1-htcJCzDORV1j+64S3aUaR93K+bI=",
+      "dev": true
     },
     "meow": {
       "version": "3.7.0",
@@ -7051,9 +6835,9 @@
       }
     },
     "mime": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-2.0.3.tgz",
-      "integrity": "sha512-TrpAd/vX3xaLPDgVRm6JkZwLR0KHfukMdU2wTEbqMDdCnY6Yo3mE+mjs9YE6oMNw2QRfXVeBEYpmpO94BIqiug==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-2.1.0.tgz",
+      "integrity": "sha512-jPEuocEVyg24I7hWcF6EL5qH0OQ3Ficy95tXA9eNBN6qXsIopYi/CJl3ldTUR+Sljt2rP2SkWpeTcAMon/pjKA==",
       "dev": true
     },
     "mime-db": {
@@ -7108,6 +6892,24 @@
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
       "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
     },
+    "mississippi": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-1.3.0.tgz",
+      "integrity": "sha1-0gFYPrEjJ+PFwWQqQEqcrPlONPU=",
+      "dev": true,
+      "requires": {
+        "concat-stream": "1.6.0",
+        "duplexify": "3.5.1",
+        "end-of-stream": "1.4.0",
+        "flush-write-stream": "1.0.2",
+        "from2": "2.3.0",
+        "parallel-transform": "1.1.0",
+        "pump": "1.0.3",
+        "pumpify": "1.3.5",
+        "stream-each": "1.2.2",
+        "through2": "2.0.3"
+      }
+    },
     "mixin-object": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/mixin-object/-/mixin-object-2.0.1.tgz",
@@ -7134,15 +6936,29 @@
         "minimist": "0.0.8"
       }
     },
+    "move-concurrently": {
+      "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.2.0",
+        "copy-concurrently": "1.0.5",
+        "fs-write-stream-atomic": "1.0.10",
+        "mkdirp": "0.5.1",
+        "rimraf": "2.6.2",
+        "run-queue": "1.0.3"
+      }
+    },
     "ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
     },
     "multicast-dns": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.1.1.tgz",
-      "integrity": "sha1-bn3oalcIcqsXBYrepxYLvsqBTd4=",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.1.tgz",
+      "integrity": "sha512-uV3/ckdsffHx9IrGQrx613mturMdMqQ06WTq+C09NsStJ9iNG6RcUWgPKs1Rfjy+idZT6tfQoXEusGNnEZhT3w==",
       "dev": true,
       "requires": {
         "dns-packet": "1.2.2",
@@ -7162,9 +6978,9 @@
       "dev": true
     },
     "nan": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.7.0.tgz",
-      "integrity": "sha1-2Vv3IeyHfgjbJ27T/G63j5CDrUY=",
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.8.0.tgz",
+      "integrity": "sha1-7XFfP+neArV6XmJS2QqWZ14fCFo=",
       "dev": true
     },
     "natural-compare": {
@@ -7198,18 +7014,12 @@
       }
     },
     "node-abi": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.1.1.tgz",
-      "integrity": "sha512-6oxV13poCOv7TfGvhsSz6XZWpXeKkdGVh72++cs33OfMh3KAX8lN84dCvmqSETyDXAFcUHtV7eJrgFBoOqZbNQ==",
-      "dev": true
-    },
-    "node-dir": {
-      "version": "0.1.17",
-      "resolved": "https://registry.npmjs.org/node-dir/-/node-dir-0.1.17.tgz",
-      "integrity": "sha1-X1Zl2TNRM1yqvvjxxVRRbPXx5OU=",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.1.2.tgz",
+      "integrity": "sha512-hmUtb8m75RSi7N+zZLYqe75XDvZB+6LyTBPkj2DConvNgQet2e3BIqEwe1LLvqMrfyjabuT5ZOrTioLCH1HTdA==",
       "dev": true,
       "requires": {
-        "minimatch": "3.0.4"
+        "semver": "5.4.1"
       }
     },
     "node-emoji": {
@@ -7250,7 +7060,7 @@
         "nopt": "3.0.6",
         "npmlog": "4.1.2",
         "osenv": "0.1.4",
-        "request": "2.81.0",
+        "request": "2.83.0",
         "rimraf": "2.6.2",
         "semver": "5.3.0",
         "tar": "2.2.1",
@@ -7266,21 +7076,21 @@
       }
     },
     "node-libs-browser": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.0.0.tgz",
-      "integrity": "sha1-o6WeyXAkmFtG6Vg3lkb5bEthZkY=",
+      "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.4.1",
-        "browserify-zlib": "0.1.4",
+        "browserify-zlib": "0.2.0",
         "buffer": "4.9.1",
         "console-browserify": "1.1.0",
         "constants-browserify": "1.0.0",
-        "crypto-browserify": "3.11.1",
+        "crypto-browserify": "3.12.0",
         "domain-browser": "1.1.7",
         "events": "1.1.1",
-        "https-browserify": "0.0.1",
-        "os-browserify": "0.2.1",
+        "https-browserify": "1.0.0",
+        "os-browserify": "0.3.0",
         "path-browserify": "0.0.0",
         "process": "0.11.10",
         "punycode": "1.3.2",
@@ -7288,7 +7098,7 @@
         "readable-stream": "2.3.3",
         "stream-browserify": "2.0.1",
         "stream-http": "2.7.2",
-        "string_decoder": "0.10.31",
+        "string_decoder": "1.0.3",
         "timers-browserify": "2.0.4",
         "tty-browserify": "0.0.0",
         "url": "0.11.0",
@@ -7296,43 +7106,11 @@
         "vm-browserify": "0.0.4"
       },
       "dependencies": {
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
-        },
         "process": {
           "version": "0.11.10",
           "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
           "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
           "dev": true
-        },
-        "readable-stream": {
-          "version": "2.3.3",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-          "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "1.0.0",
-            "process-nextick-args": "1.0.7",
-            "safe-buffer": "5.1.1",
-            "string_decoder": "1.0.3",
-            "util-deprecate": "1.0.2"
-          },
-          "dependencies": {
-            "string_decoder": {
-              "version": "1.0.3",
-              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-              "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-              "dev": true,
-              "requires": {
-                "safe-buffer": "5.1.1"
-              }
-            }
-          }
         }
       }
     },
@@ -7348,9 +7126,9 @@
       }
     },
     "node-sass": {
-      "version": "4.5.3",
-      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.5.3.tgz",
-      "integrity": "sha1-0JydEXlkEjnRuX/8YjH9zsU+FWg=",
+      "version": "4.7.2",
+      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.7.2.tgz",
+      "integrity": "sha512-CaV+wLqZ7//Jdom5aUFCpGNoECd7BbNhjuwdsX/LkXBrHl8eb1Wjw4HvWqcFvhr5KuNgAk8i/myf/MQ1YYeroA==",
       "dev": true,
       "requires": {
         "async-foreach": "0.1.3",
@@ -7365,14 +7143,48 @@
         "lodash.mergewith": "4.6.0",
         "meow": "3.7.0",
         "mkdirp": "0.5.1",
-        "nan": "2.7.0",
+        "nan": "2.8.0",
         "node-gyp": "3.6.2",
         "npmlog": "4.1.2",
-        "request": "2.81.0",
+        "request": "2.79.0",
         "sass-graph": "2.2.4",
-        "stdout-stream": "1.4.0"
+        "stdout-stream": "1.4.0",
+        "true-case-path": "1.0.2"
       },
       "dependencies": {
+        "assert-plus": {
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
+          "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=",
+          "dev": true
+        },
+        "aws-sign2": {
+          "version": "0.6.0",
+          "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
+          "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=",
+          "dev": true
+        },
+        "boom": {
+          "version": "2.10.1",
+          "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
+          "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
+          "dev": true,
+          "requires": {
+            "hoek": "2.16.3"
+          }
+        },
+        "caseless": {
+          "version": "0.11.0",
+          "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz",
+          "integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c=",
+          "dev": true
+        },
+        "commander": {
+          "version": "2.12.2",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.12.2.tgz",
+          "integrity": "sha512-BFnaq5ZOGcDN7FlrtBT4xxkgIToalIIxwjxLWVJ8bGTpe1LroqMiqQXdA7ygc7CRvaYS+9zfPGFnJqFSayx+AA==",
+          "dev": true
+        },
         "cross-spawn": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz",
@@ -7382,6 +7194,116 @@
             "lru-cache": "4.1.1",
             "which": "1.3.0"
           }
+        },
+        "cryptiles": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
+          "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
+          "dev": true,
+          "requires": {
+            "boom": "2.10.1"
+          }
+        },
+        "form-data": {
+          "version": "2.1.4",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
+          "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
+          "dev": true,
+          "requires": {
+            "asynckit": "0.4.0",
+            "combined-stream": "1.0.5",
+            "mime-types": "2.1.17"
+          }
+        },
+        "har-validator": {
+          "version": "2.0.6",
+          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz",
+          "integrity": "sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0=",
+          "dev": true,
+          "requires": {
+            "chalk": "1.1.3",
+            "commander": "2.12.2",
+            "is-my-json-valid": "2.17.1",
+            "pinkie-promise": "2.0.1"
+          }
+        },
+        "hawk": {
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
+          "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
+          "dev": true,
+          "requires": {
+            "boom": "2.10.1",
+            "cryptiles": "2.0.5",
+            "hoek": "2.16.3",
+            "sntp": "1.0.9"
+          }
+        },
+        "hoek": {
+          "version": "2.16.3",
+          "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
+          "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
+          "dev": true
+        },
+        "http-signature": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
+          "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
+          "dev": true,
+          "requires": {
+            "assert-plus": "0.2.0",
+            "jsprim": "1.4.1",
+            "sshpk": "1.13.1"
+          }
+        },
+        "qs": {
+          "version": "6.3.2",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.3.2.tgz",
+          "integrity": "sha1-51vV9uJoEioqDgvaYwslUMFmUCw=",
+          "dev": true
+        },
+        "request": {
+          "version": "2.79.0",
+          "resolved": "https://registry.npmjs.org/request/-/request-2.79.0.tgz",
+          "integrity": "sha1-Tf5b9r6LjNw3/Pk+BLZVd3InEN4=",
+          "dev": true,
+          "requires": {
+            "aws-sign2": "0.6.0",
+            "aws4": "1.6.0",
+            "caseless": "0.11.0",
+            "combined-stream": "1.0.5",
+            "extend": "3.0.1",
+            "forever-agent": "0.6.1",
+            "form-data": "2.1.4",
+            "har-validator": "2.0.6",
+            "hawk": "3.1.3",
+            "http-signature": "1.1.1",
+            "is-typedarray": "1.0.0",
+            "isstream": "0.1.2",
+            "json-stringify-safe": "5.0.1",
+            "mime-types": "2.1.17",
+            "oauth-sign": "0.8.2",
+            "qs": "6.3.2",
+            "stringstream": "0.0.5",
+            "tough-cookie": "2.3.3",
+            "tunnel-agent": "0.4.3",
+            "uuid": "3.1.0"
+          }
+        },
+        "sntp": {
+          "version": "1.0.9",
+          "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
+          "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
+          "dev": true,
+          "requires": {
+            "hoek": "2.16.3"
+          }
+        },
+        "tunnel-agent": {
+          "version": "0.4.3",
+          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
+          "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=",
+          "dev": true
         }
       }
     },
@@ -7397,13 +7319,14 @@
       "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
       "dev": true,
       "requires": {
-        "abbrev": "1.1.0"
+        "abbrev": "1.1.1"
       }
     },
     "normalize-package-data": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
       "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==",
+      "dev": true,
       "requires": {
         "hosted-git-info": "2.5.0",
         "is-builtin-module": "1.0.0",
@@ -7439,18 +7362,18 @@
       }
     },
     "npm-run-all": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/npm-run-all/-/npm-run-all-4.1.1.tgz",
-      "integrity": "sha512-qrmqqaJa+REbzUTIL/mHfTdgwz+gL1xUezY/ueyLa7GISZ4T3h0CH8D2r6AaZdCYN2unu7PzspP0ofpXla1ftg==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/npm-run-all/-/npm-run-all-4.1.2.tgz",
+      "integrity": "sha512-Z2aRlajMK4SQ8u19ZA75NZZu7wupfCNQWdYosIi8S6FgBdGf/8Y6Hgyjdc8zU2cYmIRVCx1nM80tJPkdEd+UYg==",
       "dev": true,
       "requires": {
         "ansi-styles": "3.2.0",
-        "chalk": "2.1.0",
+        "chalk": "2.3.0",
         "cross-spawn": "5.1.0",
-        "memory-streams": "0.1.2",
+        "memorystream": "0.3.1",
         "minimatch": "3.0.4",
         "ps-tree": "1.1.0",
-        "read-pkg": "2.0.0",
+        "read-pkg": "3.0.0",
         "shell-quote": "1.6.1",
         "string.prototype.padend": "3.0.0"
       },
@@ -7461,56 +7384,51 @@
           "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
           "dev": true,
           "requires": {
-            "color-convert": "1.9.0"
+            "color-convert": "1.9.1"
           }
         },
         "chalk": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz",
-          "integrity": "sha512-LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ==",
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
+          "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
           "dev": true,
           "requires": {
             "ansi-styles": "3.2.0",
             "escape-string-regexp": "1.0.5",
-            "supports-color": "4.4.0"
+            "supports-color": "4.5.0"
           }
         },
-        "has-flag": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-          "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
-          "dev": true
-        },
         "load-json-file": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
-          "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
+          "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
           "dev": true,
           "requires": {
             "graceful-fs": "4.1.11",
-            "parse-json": "2.2.0",
-            "pify": "2.3.0",
+            "parse-json": "4.0.0",
+            "pify": "3.0.0",
             "strip-bom": "3.0.0"
           }
         },
-        "path-type": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
-          "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
+        "parse-json": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
+          "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
           "dev": true,
           "requires": {
-            "pify": "2.3.0"
+            "error-ex": "1.3.1",
+            "json-parse-better-errors": "1.0.1"
           }
         },
         "read-pkg": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
-          "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
+          "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
           "dev": true,
           "requires": {
-            "load-json-file": "2.0.0",
+            "load-json-file": "4.0.0",
             "normalize-package-data": "2.4.0",
-            "path-type": "2.0.0"
+            "path-type": "3.0.0"
           }
         },
         "strip-bom": {
@@ -7520,9 +7438,9 @@
           "dev": true
         },
         "supports-color": {
-          "version": "4.4.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz",
-          "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==",
+          "version": "4.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
+          "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
           "dev": true,
           "requires": {
             "has-flag": "2.0.0"
@@ -7569,7 +7487,7 @@
         "minimist": "1.2.0",
         "pretty-bytes": "1.0.4",
         "progress-stream": "1.2.0",
-        "request": "2.81.0",
+        "request": "2.83.0",
         "single-line-log": "1.1.2",
         "throttleit": "0.0.2"
       },
@@ -7723,9 +7641,9 @@
       }
     },
     "os-browserify": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.2.1.tgz",
-      "integrity": "sha1-Y/xMzuXS13Y9Jrv4YBB45sLgBE8=",
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
+      "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=",
       "dev": true
     },
     "os-homedir": {
@@ -7797,11 +7715,22 @@
       }
     },
     "pako": {
-      "version": "0.2.9",
-      "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz",
-      "integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=",
+      "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
     },
+    "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",
+        "readable-stream": "2.3.3"
+      }
+    },
     "param-case": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz",
@@ -7817,7 +7746,7 @@
       "integrity": "sha1-N8T5t+06tlx0gXtfJICTf7+XxxI=",
       "dev": true,
       "requires": {
-        "asn1.js": "4.9.1",
+        "asn1.js": "4.9.2",
         "browserify-aes": "1.1.1",
         "create-hash": "1.1.3",
         "evp_bytestokey": "1.0.3",
@@ -7874,6 +7803,7 @@
       "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.3.1"
       }
@@ -7926,14 +7856,12 @@
       }
     },
     "path-type": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-      "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
+      "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
       "dev": true,
       "requires": {
-        "graceful-fs": "4.1.11",
-        "pify": "2.3.0",
-        "pinkie-promise": "2.0.1"
+        "pify": "3.0.0"
       }
     },
     "pause-stream": {
@@ -7965,15 +7893,16 @@
       "dev": true
     },
     "performance-now": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz",
-      "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
       "dev": true
     },
     "pify": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+      "dev": true
     },
     "pinkie": {
       "version": "2.0.4",
@@ -8045,17 +7974,29 @@
       }
     },
     "postcss": {
-      "version": "5.2.17",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
-      "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=",
+      "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.2.0",
+        "js-base64": "2.4.0",
         "source-map": "0.5.7",
         "supports-color": "3.2.3"
       },
       "dependencies": {
+        "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
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true
+        },
         "supports-color": {
           "version": "3.2.3",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
@@ -8073,7 +8014,7 @@
       "integrity": "sha1-d7rnypKK2FcW4v2kLyYb98HWW14=",
       "dev": true,
       "requires": {
-        "postcss": "5.2.17",
+        "postcss": "5.2.18",
         "postcss-message-helpers": "2.0.0",
         "reduce-css-calc": "1.3.0"
       }
@@ -8085,7 +8026,7 @@
       "dev": true,
       "requires": {
         "colormin": "1.1.2",
-        "postcss": "5.2.17",
+        "postcss": "5.2.18",
         "postcss-value-parser": "3.3.0"
       }
     },
@@ -8095,7 +8036,7 @@
       "integrity": "sha1-u9hZPFwf0uPRwyK7kl3K6Nrk1i0=",
       "dev": true,
       "requires": {
-        "postcss": "5.2.17",
+        "postcss": "5.2.18",
         "postcss-value-parser": "3.3.0"
       }
     },
@@ -8105,7 +8046,7 @@
       "integrity": "sha1-vv6J+v1bPazlzM5Rt2uBUUvgDj0=",
       "dev": true,
       "requires": {
-        "postcss": "5.2.17"
+        "postcss": "5.2.18"
       }
     },
     "postcss-discard-duplicates": {
@@ -8114,7 +8055,7 @@
       "integrity": "sha1-uavye4isGIFYpesSq8riAmO5GTI=",
       "dev": true,
       "requires": {
-        "postcss": "5.2.17"
+        "postcss": "5.2.18"
       }
     },
     "postcss-discard-empty": {
@@ -8123,7 +8064,7 @@
       "integrity": "sha1-0rS9nVztXr2Nyt52QMfXzX9PkrU=",
       "dev": true,
       "requires": {
-        "postcss": "5.2.17"
+        "postcss": "5.2.18"
       }
     },
     "postcss-discard-overridden": {
@@ -8132,7 +8073,7 @@
       "integrity": "sha1-ix6vVU9ob7KIzYdMVWZ7CqNmjVg=",
       "dev": true,
       "requires": {
-        "postcss": "5.2.17"
+        "postcss": "5.2.18"
       }
     },
     "postcss-discard-unused": {
@@ -8141,7 +8082,7 @@
       "integrity": "sha1-vOMLLMWR/8Y0Mitfs0ZLbZNPRDM=",
       "dev": true,
       "requires": {
-        "postcss": "5.2.17",
+        "postcss": "5.2.18",
         "uniqs": "2.0.0"
       }
     },
@@ -8151,7 +8092,7 @@
       "integrity": "sha1-bYWGJTTXNaxCDkqFgG4fXUKG2Ew=",
       "dev": true,
       "requires": {
-        "postcss": "5.2.17",
+        "postcss": "5.2.18",
         "uniqid": "4.1.1"
       }
     },
@@ -8162,7 +8103,7 @@
       "dev": true,
       "requires": {
         "has": "1.0.1",
-        "postcss": "5.2.17",
+        "postcss": "5.2.18",
         "postcss-value-parser": "3.3.0"
       }
     },
@@ -8172,7 +8113,7 @@
       "integrity": "sha1-I9kM0Sewp3mUkVMyc5A0oaTz1lg=",
       "dev": true,
       "requires": {
-        "postcss": "5.2.17"
+        "postcss": "5.2.18"
       }
     },
     "postcss-merge-rules": {
@@ -8183,7 +8124,7 @@
       "requires": {
         "browserslist": "1.7.7",
         "caniuse-api": "1.6.1",
-        "postcss": "5.2.17",
+        "postcss": "5.2.18",
         "postcss-selector-parser": "2.2.3",
         "vendors": "1.0.1"
       }
@@ -8201,7 +8142,7 @@
       "dev": true,
       "requires": {
         "object-assign": "4.1.1",
-        "postcss": "5.2.17",
+        "postcss": "5.2.18",
         "postcss-value-parser": "3.3.0"
       }
     },
@@ -8211,7 +8152,7 @@
       "integrity": "sha1-Xb2hE3NwP4PPtKPqOIHY11/15uE=",
       "dev": true,
       "requires": {
-        "postcss": "5.2.17",
+        "postcss": "5.2.18",
         "postcss-value-parser": "3.3.0"
       }
     },
@@ -8222,7 +8163,7 @@
       "dev": true,
       "requires": {
         "alphanum-sort": "1.0.2",
-        "postcss": "5.2.17",
+        "postcss": "5.2.18",
         "postcss-value-parser": "3.3.0",
         "uniqs": "2.0.0"
       }
@@ -8235,7 +8176,7 @@
       "requires": {
         "alphanum-sort": "1.0.2",
         "has": "1.0.1",
-        "postcss": "5.2.17",
+        "postcss": "5.2.18",
         "postcss-selector-parser": "2.2.3"
       }
     },
@@ -8245,7 +8186,7 @@
       "integrity": "sha1-thTJcgvmgW6u41+zpfqh26agXds=",
       "dev": true,
       "requires": {
-        "postcss": "6.0.11"
+        "postcss": "6.0.14"
       },
       "dependencies": {
         "ansi-styles": {
@@ -8254,41 +8195,35 @@
           "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
           "dev": true,
           "requires": {
-            "color-convert": "1.9.0"
+            "color-convert": "1.9.1"
           }
         },
         "chalk": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz",
-          "integrity": "sha512-LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ==",
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
+          "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
           "dev": true,
           "requires": {
             "ansi-styles": "3.2.0",
             "escape-string-regexp": "1.0.5",
-            "supports-color": "4.4.0"
+            "supports-color": "4.5.0"
           }
         },
-        "has-flag": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-          "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
-          "dev": true
-        },
         "postcss": {
-          "version": "6.0.11",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.11.tgz",
-          "integrity": "sha512-DsnIzznNRQprsGTALpkC0xjDygo+QcOd+qVjP9+RjyzrPiyYOXBGOwoJ4rAiiE4lu6JggQ/jW4niY24WLxuncg==",
+          "version": "6.0.14",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.14.tgz",
+          "integrity": "sha512-NJ1z0f+1offCgadPhz+DvGm5Mkci+mmV5BqD13S992o0Xk9eElxUfPPF+t2ksH5R/17gz4xVK8KWocUQ5o3Rog==",
           "dev": true,
           "requires": {
-            "chalk": "2.1.0",
-            "source-map": "0.5.7",
-            "supports-color": "4.4.0"
+            "chalk": "2.3.0",
+            "source-map": "0.6.1",
+            "supports-color": "4.5.0"
           }
         },
         "supports-color": {
-          "version": "4.4.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz",
-          "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==",
+          "version": "4.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
+          "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
           "dev": true,
           "requires": {
             "has-flag": "2.0.0"
@@ -8303,7 +8238,7 @@
       "dev": true,
       "requires": {
         "css-selector-tokenizer": "0.7.0",
-        "postcss": "6.0.11"
+        "postcss": "6.0.14"
       },
       "dependencies": {
         "ansi-styles": {
@@ -8312,41 +8247,35 @@
           "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
           "dev": true,
           "requires": {
-            "color-convert": "1.9.0"
+            "color-convert": "1.9.1"
           }
         },
         "chalk": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz",
-          "integrity": "sha512-LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ==",
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
+          "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
           "dev": true,
           "requires": {
             "ansi-styles": "3.2.0",
             "escape-string-regexp": "1.0.5",
-            "supports-color": "4.4.0"
+            "supports-color": "4.5.0"
           }
         },
-        "has-flag": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-          "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
-          "dev": true
-        },
         "postcss": {
-          "version": "6.0.11",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.11.tgz",
-          "integrity": "sha512-DsnIzznNRQprsGTALpkC0xjDygo+QcOd+qVjP9+RjyzrPiyYOXBGOwoJ4rAiiE4lu6JggQ/jW4niY24WLxuncg==",
+          "version": "6.0.14",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.14.tgz",
+          "integrity": "sha512-NJ1z0f+1offCgadPhz+DvGm5Mkci+mmV5BqD13S992o0Xk9eElxUfPPF+t2ksH5R/17gz4xVK8KWocUQ5o3Rog==",
           "dev": true,
           "requires": {
-            "chalk": "2.1.0",
-            "source-map": "0.5.7",
-            "supports-color": "4.4.0"
+            "chalk": "2.3.0",
+            "source-map": "0.6.1",
+            "supports-color": "4.5.0"
           }
         },
         "supports-color": {
-          "version": "4.4.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz",
-          "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==",
+          "version": "4.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
+          "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
           "dev": true,
           "requires": {
             "has-flag": "2.0.0"
@@ -8361,7 +8290,7 @@
       "dev": true,
       "requires": {
         "css-selector-tokenizer": "0.7.0",
-        "postcss": "6.0.11"
+        "postcss": "6.0.14"
       },
       "dependencies": {
         "ansi-styles": {
@@ -8370,41 +8299,35 @@
           "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
           "dev": true,
           "requires": {
-            "color-convert": "1.9.0"
+            "color-convert": "1.9.1"
           }
         },
         "chalk": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz",
-          "integrity": "sha512-LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ==",
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
+          "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
           "dev": true,
           "requires": {
             "ansi-styles": "3.2.0",
             "escape-string-regexp": "1.0.5",
-            "supports-color": "4.4.0"
+            "supports-color": "4.5.0"
           }
         },
-        "has-flag": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-          "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
-          "dev": true
-        },
         "postcss": {
-          "version": "6.0.11",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.11.tgz",
-          "integrity": "sha512-DsnIzznNRQprsGTALpkC0xjDygo+QcOd+qVjP9+RjyzrPiyYOXBGOwoJ4rAiiE4lu6JggQ/jW4niY24WLxuncg==",
+          "version": "6.0.14",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.14.tgz",
+          "integrity": "sha512-NJ1z0f+1offCgadPhz+DvGm5Mkci+mmV5BqD13S992o0Xk9eElxUfPPF+t2ksH5R/17gz4xVK8KWocUQ5o3Rog==",
           "dev": true,
           "requires": {
-            "chalk": "2.1.0",
-            "source-map": "0.5.7",
-            "supports-color": "4.4.0"
+            "chalk": "2.3.0",
+            "source-map": "0.6.1",
+            "supports-color": "4.5.0"
           }
         },
         "supports-color": {
-          "version": "4.4.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz",
-          "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==",
+          "version": "4.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
+          "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
           "dev": true,
           "requires": {
             "has-flag": "2.0.0"
@@ -8419,7 +8342,7 @@
       "dev": true,
       "requires": {
         "icss-replace-symbols": "1.1.0",
-        "postcss": "6.0.11"
+        "postcss": "6.0.14"
       },
       "dependencies": {
         "ansi-styles": {
@@ -8428,41 +8351,35 @@
           "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
           "dev": true,
           "requires": {
-            "color-convert": "1.9.0"
+            "color-convert": "1.9.1"
           }
         },
         "chalk": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz",
-          "integrity": "sha512-LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ==",
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
+          "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
           "dev": true,
           "requires": {
             "ansi-styles": "3.2.0",
             "escape-string-regexp": "1.0.5",
-            "supports-color": "4.4.0"
+            "supports-color": "4.5.0"
           }
         },
-        "has-flag": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-          "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
-          "dev": true
-        },
         "postcss": {
-          "version": "6.0.11",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.11.tgz",
-          "integrity": "sha512-DsnIzznNRQprsGTALpkC0xjDygo+QcOd+qVjP9+RjyzrPiyYOXBGOwoJ4rAiiE4lu6JggQ/jW4niY24WLxuncg==",
+          "version": "6.0.14",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.14.tgz",
+          "integrity": "sha512-NJ1z0f+1offCgadPhz+DvGm5Mkci+mmV5BqD13S992o0Xk9eElxUfPPF+t2ksH5R/17gz4xVK8KWocUQ5o3Rog==",
           "dev": true,
           "requires": {
-            "chalk": "2.1.0",
-            "source-map": "0.5.7",
-            "supports-color": "4.4.0"
+            "chalk": "2.3.0",
+            "source-map": "0.6.1",
+            "supports-color": "4.5.0"
           }
         },
         "supports-color": {
-          "version": "4.4.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz",
-          "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==",
+          "version": "4.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
+          "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
           "dev": true,
           "requires": {
             "has-flag": "2.0.0"
@@ -8476,7 +8393,7 @@
       "integrity": "sha1-757nEhLX/nWceO0WL2HtYrXLk/E=",
       "dev": true,
       "requires": {
-        "postcss": "5.2.17"
+        "postcss": "5.2.18"
       }
     },
     "postcss-normalize-url": {
@@ -8487,7 +8404,7 @@
       "requires": {
         "is-absolute-url": "2.1.0",
         "normalize-url": "1.9.1",
-        "postcss": "5.2.17",
+        "postcss": "5.2.18",
         "postcss-value-parser": "3.3.0"
       }
     },
@@ -8497,7 +8414,7 @@
       "integrity": "sha1-7sbCpntsQSqNsgQud/6NpD+VwR0=",
       "dev": true,
       "requires": {
-        "postcss": "5.2.17",
+        "postcss": "5.2.18",
         "postcss-value-parser": "3.3.0"
       }
     },
@@ -8507,7 +8424,7 @@
       "integrity": "sha1-wsbSDMlYKE9qv75j92Cb9AkFmtM=",
       "dev": true,
       "requires": {
-        "postcss": "5.2.17",
+        "postcss": "5.2.18",
         "postcss-value-parser": "3.3.0"
       }
     },
@@ -8517,7 +8434,7 @@
       "integrity": "sha1-aPgGlfBF0IJjqHmtJA343WT2ROo=",
       "dev": true,
       "requires": {
-        "postcss": "5.2.17"
+        "postcss": "5.2.18"
       }
     },
     "postcss-reduce-transforms": {
@@ -8527,7 +8444,7 @@
       "dev": true,
       "requires": {
         "has": "1.0.1",
-        "postcss": "5.2.17",
+        "postcss": "5.2.18",
         "postcss-value-parser": "3.3.0"
       }
     },
@@ -8549,7 +8466,7 @@
       "dev": true,
       "requires": {
         "is-svg": "2.1.0",
-        "postcss": "5.2.17",
+        "postcss": "5.2.18",
         "postcss-value-parser": "3.3.0",
         "svgo": "0.7.2"
       }
@@ -8561,7 +8478,7 @@
       "dev": true,
       "requires": {
         "alphanum-sort": "1.0.2",
-        "postcss": "5.2.17",
+        "postcss": "5.2.18",
         "uniqs": "2.0.0"
       }
     },
@@ -8578,25 +8495,25 @@
       "dev": true,
       "requires": {
         "has": "1.0.1",
-        "postcss": "5.2.17",
+        "postcss": "5.2.18",
         "uniqs": "2.0.0"
       }
     },
     "prebuild-install": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-2.3.0.tgz",
-      "integrity": "sha512-gzjq2oHB8oMbzJSsSh9MQ64zrXZGt092/uT4TLZlz2qnrPxpWqp4vYB7LZrDxnlxf5RfbCjkgDI/z0EIVuYzAw==",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-2.4.1.tgz",
+      "integrity": "sha512-99TyEFYTTkBWANT+mwSptmLb9ZCLQ6qKIUE36fXSIOtShB0JNprL2hzBD8F1yIuT9btjFrFEwbRHXhqDi1HmRA==",
       "dev": true,
       "requires": {
         "expand-template": "1.1.0",
         "github-from-package": "0.0.0",
         "minimist": "1.2.0",
         "mkdirp": "0.5.1",
-        "node-abi": "2.1.1",
+        "node-abi": "2.1.2",
         "noop-logger": "0.1.1",
         "npmlog": "4.1.2",
         "os-homedir": "1.0.2",
-        "pump": "1.0.2",
+        "pump": "1.0.3",
         "rc": "1.2.2",
         "simple-get": "1.4.3",
         "tar-fs": "1.16.0",
@@ -8609,12 +8526,6 @@
           "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
           "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
           "dev": true
-        },
-        "xtend": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-          "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
-          "dev": true
         }
       }
     },
@@ -8657,9 +8568,9 @@
       }
     },
     "private": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/private/-/private-0.1.7.tgz",
-      "integrity": "sha1-aM5eih7woju1cMwoU3tTMqumPvE=",
+      "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
     },
     "process": {
@@ -8688,6 +8599,45 @@
       "requires": {
         "speedometer": "0.1.4",
         "through2": "0.2.3"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "1.1.14",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+          "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
+          "dev": true,
+          "requires": {
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "0.0.1",
+            "string_decoder": "0.10.31"
+          }
+        },
+        "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
+        },
+        "through2": {
+          "version": "0.2.3",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-0.2.3.tgz",
+          "integrity": "sha1-6zKE2k6jEbbMis42U3SKUqvyWj8=",
+          "dev": true,
+          "requires": {
+            "readable-stream": "1.1.14",
+            "xtend": "2.1.2"
+          }
+        },
+        "xtend": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz",
+          "integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=",
+          "dev": true,
+          "requires": {
+            "object-keys": "0.4.0"
+          }
+        }
       }
     },
     "promise": {
@@ -8698,6 +8648,12 @@
         "asap": "2.0.6"
       }
     },
+    "promise-inflight": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
+      "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=",
+      "dev": true
+    },
     "prop-types": {
       "version": "15.6.0",
       "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.0.tgz",
@@ -8706,22 +8662,6 @@
         "fbjs": "0.8.16",
         "loose-envify": "1.3.1",
         "object-assign": "4.1.1"
-      },
-      "dependencies": {
-        "fbjs": {
-          "version": "0.8.16",
-          "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.16.tgz",
-          "integrity": "sha1-XmdDL1UNxBtXK/VYR7ispk5TN9s=",
-          "requires": {
-            "core-js": "1.2.7",
-            "isomorphic-fetch": "2.2.1",
-            "loose-envify": "1.3.1",
-            "object-assign": "4.1.1",
-            "promise": "7.3.1",
-            "setimmediate": "1.0.5",
-            "ua-parser-js": "0.7.14"
-          }
-        }
       }
     },
     "proxy-addr": {
@@ -8735,9 +8675,9 @@
       }
     },
     "prr": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz",
-      "integrity": "sha1-GoS4WQgyVQFBGFPQCB7j+obikmo=",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
+      "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=",
       "dev": true
     },
     "ps-tree": {
@@ -8768,30 +8708,41 @@
       }
     },
     "pump": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-1.0.2.tgz",
-      "integrity": "sha1-Oz7mUS+U8OV1U4wXmV+fFpkKXVE=",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-1.0.3.tgz",
+      "integrity": "sha512-8k0JupWme55+9tCVE+FS5ULT3K6AbgqrGa58lTT49RpyfwwcGedHqaC5LlQNdEAumn/wFsu6aPwkuPMioy8kqw==",
       "dev": true,
       "requires": {
         "end-of-stream": "1.4.0",
         "once": "1.4.0"
       }
     },
+    "pumpify": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.3.5.tgz",
+      "integrity": "sha1-G2ccYZlAq8rqwK0OOjwWS+dgmTs=",
+      "dev": true,
+      "requires": {
+        "duplexify": "3.5.1",
+        "inherits": "2.0.3",
+        "pump": "1.0.3"
+      }
+    },
     "punycode": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
       "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0="
     },
     "q": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/q/-/q-1.5.0.tgz",
-      "integrity": "sha1-3QG6ydBtMObyGa7LglPunr3DCPE=",
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
+      "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
       "dev": true
     },
     "qs": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
-      "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=",
+      "version": "6.5.1",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz",
+      "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==",
       "dev": true
     },
     "query-string": {
@@ -8822,14 +8773,14 @@
       "dev": true
     },
     "rabin-bindings": {
-      "version": "1.7.3",
-      "resolved": "https://registry.npmjs.org/rabin-bindings/-/rabin-bindings-1.7.3.tgz",
-      "integrity": "sha512-zeVdstq+EWdwQ5JCyuuvOsP2fmGc6993laN+v8eEQsahHwZCy8bt5TefohUpgsetiwQhMMk/o+m/2sYng13Txw==",
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/rabin-bindings/-/rabin-bindings-1.7.4.tgz",
+      "integrity": "sha512-4Ml+Hsw1asNttafMFF+GWgGOcZs9nJk7qb3GE9eyihMUOrxFVcKeKcfeCncTSIPYsfWNvdf4yc0GGbHPUiQYjg==",
       "dev": true,
       "requires": {
         "bindings": "1.3.0",
-        "nan": "2.7.0",
-        "prebuild-install": "2.3.0"
+        "nan": "2.8.0",
+        "prebuild-install": "2.4.1"
       }
     },
     "randomatic": {
@@ -8857,7 +8808,7 @@
               "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
               "dev": true,
               "requires": {
-                "is-buffer": "1.1.5"
+                "is-buffer": "1.1.6"
               }
             }
           }
@@ -8868,7 +8819,7 @@
           "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
           "dev": true,
           "requires": {
-            "is-buffer": "1.1.5"
+            "is-buffer": "1.1.6"
           }
         }
       }
@@ -8882,6 +8833,16 @@
         "safe-buffer": "5.1.1"
       }
     },
+    "randomfill": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.3.tgz",
+      "integrity": "sha512-YL6GrhrWoic0Eq8rXVbMptH7dAxCs0J+mh5Y0euNekPPYaxEmdVGim6GdoxoRzKW2yJoU8tueifS7mYxvcFDEQ==",
+      "dev": true,
+      "requires": {
+        "randombytes": "2.0.5",
+        "safe-buffer": "5.1.1"
+      }
+    },
     "range-parser": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz",
@@ -8918,7 +8879,7 @@
       "dev": true,
       "requires": {
         "deep-extend": "0.4.2",
-        "ini": "1.3.4",
+        "ini": "1.3.5",
         "minimist": "1.2.0",
         "strip-json-comments": "2.0.1"
       },
@@ -8932,30 +8893,14 @@
       }
     },
     "react": {
-      "version": "16.0.0",
-      "resolved": "https://registry.npmjs.org/react/-/react-16.0.0.tgz",
-      "integrity": "sha1-zn348ZQbA28Cssyp29DLHw6FXi0=",
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/react/-/react-16.2.0.tgz",
+      "integrity": "sha512-ZmIomM7EE1DvPEnSFAHZn9Vs9zJl5A9H7el0EGTE6ZbW9FKe/14IYAlPbC8iH25YarEQxZL+E8VW7Mi7kfQrDQ==",
       "requires": {
         "fbjs": "0.8.16",
         "loose-envify": "1.3.1",
         "object-assign": "4.1.1",
         "prop-types": "15.6.0"
-      },
-      "dependencies": {
-        "fbjs": {
-          "version": "0.8.16",
-          "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.16.tgz",
-          "integrity": "sha1-XmdDL1UNxBtXK/VYR7ispk5TN9s=",
-          "requires": {
-            "core-js": "1.2.7",
-            "isomorphic-fetch": "2.2.1",
-            "loose-envify": "1.3.1",
-            "object-assign": "4.1.1",
-            "promise": "7.3.1",
-            "setimmediate": "1.0.5",
-            "ua-parser-js": "0.7.14"
-          }
-        }
       }
     },
     "react-deep-force-update": {
@@ -8965,36 +8910,20 @@
       "dev": true
     },
     "react-dom": {
-      "version": "16.0.0",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.0.0.tgz",
-      "integrity": "sha1-nMMHnD3NcNTG4BuEqrKn40wwP1g=",
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.2.0.tgz",
+      "integrity": "sha512-zpGAdwHVn9K0091d+hr+R0qrjoJ84cIBFL2uU60KvWBPfZ7LPSrfqviTxGHWN0sjPZb2hxWzMexwrvJdKePvjg==",
       "requires": {
         "fbjs": "0.8.16",
         "loose-envify": "1.3.1",
         "object-assign": "4.1.1",
         "prop-types": "15.6.0"
-      },
-      "dependencies": {
-        "fbjs": {
-          "version": "0.8.16",
-          "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.16.tgz",
-          "integrity": "sha1-XmdDL1UNxBtXK/VYR7ispk5TN9s=",
-          "requires": {
-            "core-js": "1.2.7",
-            "isomorphic-fetch": "2.2.1",
-            "loose-envify": "1.3.1",
-            "object-assign": "4.1.1",
-            "promise": "7.3.1",
-            "setimmediate": "1.0.5",
-            "ua-parser-js": "0.7.14"
-          }
-        }
       }
     },
     "react-hot-loader": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/react-hot-loader/-/react-hot-loader-3.1.1.tgz",
-      "integrity": "sha512-TxvSs1KN+YZxdXIX5sq0AKEy8dBdyiUE9nK9ML4Op6S06tkvNAg51V8OSvlQemCQkOfk8gTc5O8azUCvV4vTUw==",
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/react-hot-loader/-/react-hot-loader-3.1.3.tgz",
+      "integrity": "sha512-d7nZf78irxoGN5PY4zd6CSgZiroOhvIWzRast3qwTn4sSnBwlt08kV8WMQ9mitmxEdlCTwZt+5ClrRSjxWguMQ==",
       "dev": true,
       "requires": {
         "global": "4.3.2",
@@ -9002,14 +8931,6 @@
         "react-proxy": "3.0.0-alpha.1",
         "redbox-react": "1.5.0",
         "source-map": "0.6.1"
-      },
-      "dependencies": {
-        "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
-        }
       }
     },
     "react-proxy": {
@@ -9062,12 +8983,12 @@
       }
     },
     "react-transition-group": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-1.2.0.tgz",
-      "integrity": "sha1-tR/JIbDDg1p+98Vxx5/ILHPpIE8=",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-1.2.1.tgz",
+      "integrity": "sha512-CWaL3laCmgAFdxdKbhhps+c0HRGF4c+hdM4H23+FI1QBNUyx/AMeIJGWorehPNSaKnQNOAxL7PQmqMu78CDj3Q==",
       "requires": {
         "chain-function": "1.0.0",
-        "dom-helpers": "3.2.1",
+        "dom-helpers": "3.3.1",
         "loose-envify": "1.3.1",
         "prop-types": "15.6.0",
         "warning": "3.0.0"
@@ -9084,34 +9005,20 @@
       }
     },
     "read-config-file": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/read-config-file/-/read-config-file-1.2.0.tgz",
-      "integrity": "sha512-A1MNfKNIfYV7vXMOQ/CPCuVpCdWoPULu8whmrkKxwN8FUsv6EjwU2SPSNueeTKR6tZPl7+Qeondyb4/pAcoozQ==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/read-config-file/-/read-config-file-1.2.1.tgz",
+      "integrity": "sha512-XbBZIKDFknS5pV2ddMTTfdwMEIUhUS6io1PYB35E4i7d7RwYrKQ2ix9EfzrN7UK/b3sispCXhlWTLdJnVCFuMw==",
       "dev": true,
       "requires": {
-        "ajv": "5.3.0",
-        "ajv-keywords": "2.1.0",
+        "ajv": "5.5.2",
+        "ajv-keywords": "2.1.1",
         "bluebird-lst": "1.0.5",
         "dotenv": "4.0.0",
         "dotenv-expand": "4.0.1",
-        "fs-extra-p": "4.4.4",
+        "fs-extra-p": "4.5.0",
         "js-yaml": "3.10.0",
         "json5": "0.5.1",
-        "lazy-val": "1.0.2"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.3.0.tgz",
-          "integrity": "sha1-RBT/dKUIecII7l/cgm4ywwNUnto=",
-          "dev": true,
-          "requires": {
-            "co": "4.6.0",
-            "fast-deep-equal": "1.0.0",
-            "fast-json-stable-stringify": "2.0.0",
-            "json-schema-traverse": "0.3.1"
-          }
-        }
+        "lazy-val": "1.0.3"
       }
     },
     "read-pkg": {
@@ -9123,6 +9030,25 @@
         "load-json-file": "1.1.0",
         "normalize-package-data": "2.4.0",
         "path-type": "1.1.0"
+      },
+      "dependencies": {
+        "path-type": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
+          "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "4.1.11",
+            "pify": "2.3.0",
+            "pinkie-promise": "2.0.1"
+          }
+        },
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        }
       }
     },
     "read-pkg-up": {
@@ -9157,15 +9083,26 @@
       }
     },
     "readable-stream": {
-      "version": "1.1.14",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-      "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
+      "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
       "dev": true,
       "requires": {
         "core-util-is": "1.0.2",
         "inherits": "2.0.3",
-        "isarray": "0.0.1",
-        "string_decoder": "0.10.31"
+        "isarray": "1.0.0",
+        "process-nextick-args": "1.0.7",
+        "safe-buffer": "5.1.1",
+        "string_decoder": "1.0.3",
+        "util-deprecate": "1.0.2"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+          "dev": true
+        }
       }
     },
     "readdirp": {
@@ -9178,38 +9115,6 @@
         "minimatch": "3.0.4",
         "readable-stream": "2.3.3",
         "set-immediate-shim": "1.0.1"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "2.3.3",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-          "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "1.0.0",
-            "process-nextick-args": "1.0.7",
-            "safe-buffer": "5.1.1",
-            "string_decoder": "1.0.3",
-            "util-deprecate": "1.0.2"
-          }
-        },
-        "string_decoder": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-          "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "5.1.1"
-          }
-        }
       }
     },
     "readline2": {
@@ -9240,7 +9145,7 @@
         "error-stack-parser": "1.3.6",
         "object-assign": "4.1.1",
         "prop-types": "15.6.0",
-        "sourcemapped-stacktrace": "1.1.7"
+        "sourcemapped-stacktrace": "1.1.8"
       }
     },
     "redent": {
@@ -9297,7 +9202,7 @@
         "lodash": "4.17.4",
         "lodash-es": "4.17.4",
         "loose-envify": "1.3.1",
-        "symbol-observable": "1.0.4"
+        "symbol-observable": "1.1.0"
       }
     },
     "redux-logger": {
@@ -9315,15 +9220,15 @@
       "integrity": "sha1-5hWhbha0ehmlFXZhM9Hj6Zt4UuU="
     },
     "regenerate": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.3.2.tgz",
-      "integrity": "sha1-0ZQcZ7rUN+G+dkM63Vs4X5WxkmA=",
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.3.3.tgz",
+      "integrity": "sha512-jVpo1GadrDAK59t/0jRx5VxYWQEDkkEKi6+HjE3joFVLfDOh9Xrdh0dF1eSq+BI/SwvTQ44gSscJ8N5zYL61sg==",
       "dev": true
     },
     "regenerator-runtime": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz",
-      "integrity": "sha512-/aA0kLeRb5N9K0d4fw7ooEbI+xDe+DKD499EQqygGqeS8N3xto15p09uY2xj7ixP81sNPXvRLnAQIqdVStgb1A==",
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
+      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
       "dev": true
     },
     "regenerator-transform": {
@@ -9334,7 +9239,7 @@
       "requires": {
         "babel-runtime": "6.26.0",
         "babel-types": "6.26.0",
-        "private": "0.1.7"
+        "private": "0.1.8"
       }
     },
     "regex-cache": {
@@ -9352,7 +9257,7 @@
       "integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=",
       "dev": true,
       "requires": {
-        "regenerate": "1.3.2",
+        "regenerate": "1.3.3",
         "regjsgen": "0.2.0",
         "regjsparser": "0.1.5"
       }
@@ -9454,46 +9359,33 @@
       }
     },
     "request": {
-      "version": "2.81.0",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
-      "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=",
+      "version": "2.83.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.83.0.tgz",
+      "integrity": "sha512-lR3gD69osqm6EYLk9wB/G1W/laGWjzH90t1vEa2xuxHD5KUrSzp9pUSfTm+YC5Nxt2T8nMPEvKlhbQayU7bgFw==",
       "dev": true,
       "requires": {
-        "aws-sign2": "0.6.0",
+        "aws-sign2": "0.7.0",
         "aws4": "1.6.0",
         "caseless": "0.12.0",
         "combined-stream": "1.0.5",
         "extend": "3.0.1",
         "forever-agent": "0.6.1",
-        "form-data": "2.1.4",
-        "har-validator": "4.2.1",
-        "hawk": "3.1.3",
-        "http-signature": "1.1.1",
+        "form-data": "2.3.1",
+        "har-validator": "5.0.3",
+        "hawk": "6.0.2",
+        "http-signature": "1.2.0",
         "is-typedarray": "1.0.0",
         "isstream": "0.1.2",
         "json-stringify-safe": "5.0.1",
         "mime-types": "2.1.17",
         "oauth-sign": "0.8.2",
-        "performance-now": "0.2.0",
-        "qs": "6.4.0",
+        "performance-now": "2.1.0",
+        "qs": "6.5.1",
         "safe-buffer": "5.1.1",
         "stringstream": "0.0.5",
-        "tough-cookie": "2.3.2",
+        "tough-cookie": "2.3.3",
         "tunnel-agent": "0.6.0",
         "uuid": "3.1.0"
-      },
-      "dependencies": {
-        "form-data": {
-          "version": "2.1.4",
-          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
-          "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
-          "dev": true,
-          "requires": {
-            "asynckit": "0.4.0",
-            "combined-stream": "1.0.5",
-            "mime-types": "2.1.17"
-          }
-        }
       }
     },
     "require-directory": {
@@ -9605,6 +9497,15 @@
         "is-promise": "2.1.0"
       }
     },
+    "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.2.0"
+      }
+    },
     "rx": {
       "version": "2.3.24",
       "resolved": "https://registry.npmjs.org/rx/-/rx-2.3.24.tgz",
@@ -9668,6 +9569,17 @@
             "lcid": "1.0.0"
           }
         },
+        "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.1.0",
+            "is-fullwidth-code-point": "1.0.0",
+            "strip-ansi": "3.0.1"
+          }
+        },
         "which-module": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
@@ -9712,7 +9624,7 @@
       "integrity": "sha1-Yw9pwhaqIGuCMvsqqQe98zNrbYM=",
       "dev": true,
       "requires": {
-        "commander": "2.11.0",
+        "commander": "2.12.2",
         "eslint": "2.13.1",
         "front-matter": "2.1.2",
         "fs-extra": "3.0.1",
@@ -9728,6 +9640,16 @@
         "util": "0.10.3"
       },
       "dependencies": {
+        "ajv": {
+          "version": "4.11.8",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
+          "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
+          "dev": true,
+          "requires": {
+            "co": "4.6.0",
+            "json-stable-stringify": "1.0.1"
+          }
+        },
         "ajv-keywords": {
           "version": "1.5.1",
           "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.1.tgz",
@@ -9750,9 +9672,9 @@
           }
         },
         "commander": {
-          "version": "2.11.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz",
-          "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==",
+          "version": "2.12.2",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.12.2.tgz",
+          "integrity": "sha512-BFnaq5ZOGcDN7FlrtBT4xxkgIToalIIxwjxLWVJ8bGTpe1LroqMiqQXdA7ygc7CRvaYS+9zfPGFnJqFSayx+AA==",
           "dev": true
         },
         "debug": {
@@ -9786,17 +9708,17 @@
             "doctrine": "1.5.0",
             "es6-map": "0.1.5",
             "escope": "3.6.0",
-            "espree": "3.5.1",
+            "espree": "3.5.2",
             "estraverse": "4.2.0",
             "esutils": "2.0.2",
             "file-entry-cache": "1.3.1",
             "glob": "7.1.2",
             "globals": "9.18.0",
-            "ignore": "3.3.6",
+            "ignore": "3.3.7",
             "imurmurhash": "0.1.4",
             "inquirer": "0.12.0",
-            "is-my-json-valid": "2.16.1",
-            "is-resolvable": "1.0.0",
+            "is-my-json-valid": "2.17.1",
+            "is-resolvable": "1.0.1",
             "js-yaml": "3.10.0",
             "json-stable-stringify": "1.0.1",
             "levn": "0.3.0",
@@ -9867,12 +9789,6 @@
             "through": "2.3.8"
           }
         },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-          "dev": true
-        },
         "isarray": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
@@ -9937,6 +9853,17 @@
           "integrity": "sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU=",
           "dev": true
         },
+        "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.1.0",
+            "is-fullwidth-code-point": "1.0.0",
+            "strip-ansi": "3.0.1"
+          }
+        },
         "strip-json-comments": {
           "version": "1.0.4",
           "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz",
@@ -9963,6 +9890,12 @@
               "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
               "dev": true
             },
+            "is-fullwidth-code-point": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+              "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+              "dev": true
+            },
             "string-width": {
               "version": "2.1.1",
               "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
@@ -9992,19 +9925,11 @@
       "integrity": "sha512-c3/Zc+iW+qqDip6kXPYLEgsAu2lf4xz0EZDplB7EmSUMda12U1sGJPetH55B/j9eu0bTtKzKlNPWWyYC7wFNyQ==",
       "dev": true,
       "requires": {
-        "async": "2.4.1",
+        "async": "2.6.0",
         "clone-deep": "0.3.0",
         "loader-utils": "1.1.0",
         "lodash.tail": "4.1.1",
         "pify": "3.0.0"
-      },
-      "dependencies": {
-        "pify": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-          "dev": true
-        }
       }
     },
     "sax": {
@@ -10018,21 +9943,7 @@
       "integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=",
       "dev": true,
       "requires": {
-        "ajv": "5.2.2"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "5.2.2",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.2.tgz",
-          "integrity": "sha1-R8aNaehvXZUxA7AHSpQw3GPaXjk=",
-          "dev": true,
-          "requires": {
-            "co": "4.6.0",
-            "fast-deep-equal": "1.0.0",
-            "json-schema-traverse": "0.3.1",
-            "json-stable-stringify": "1.0.1"
-          }
-        }
+        "ajv": "5.5.2"
       }
     },
     "scss-tokenizer": {
@@ -10041,7 +9952,7 @@
       "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=",
       "dev": true,
       "requires": {
-        "js-base64": "2.2.0",
+        "js-base64": "2.4.0",
         "source-map": "0.4.4"
       },
       "dependencies": {
@@ -10128,6 +10039,12 @@
         }
       }
     },
+    "serialize-javascript": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.4.0.tgz",
+      "integrity": "sha1-fJWFFNtqwkQ6irwGLcn3iGp/YAU=",
+      "dev": true
+    },
     "serve-index": {
       "version": "1.9.1",
       "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
@@ -10216,7 +10133,7 @@
           "integrity": "sha1-AY7HpM5+OobLkUG+UZ0kyPqpgbU=",
           "dev": true,
           "requires": {
-            "is-buffer": "1.1.5"
+            "is-buffer": "1.1.6"
           }
         }
       }
@@ -10258,108 +10175,11 @@
       "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww=="
     },
     "showdown": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/showdown/-/showdown-1.8.0.tgz",
-      "integrity": "sha1-gpTTz0KlHrF7f1ldgu+V1RIkEq0=",
+      "version": "1.8.6",
+      "resolved": "https://registry.npmjs.org/showdown/-/showdown-1.8.6.tgz",
+      "integrity": "sha1-kepO47elRIqspoIKTifmkMatdxw=",
       "requires": {
-        "yargs": "9.0.1"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "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="
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
-        },
-        "load-json-file": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
-          "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
-          "requires": {
-            "graceful-fs": "4.1.11",
-            "parse-json": "2.2.0",
-            "pify": "2.3.0",
-            "strip-bom": "3.0.0"
-          }
-        },
-        "path-type": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
-          "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
-          "requires": {
-            "pify": "2.3.0"
-          }
-        },
-        "read-pkg": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
-          "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
-          "requires": {
-            "load-json-file": "2.0.0",
-            "normalize-package-data": "2.4.0",
-            "path-type": "2.0.0"
-          }
-        },
-        "read-pkg-up": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
-          "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
-          "requires": {
-            "find-up": "2.1.0",
-            "read-pkg": "2.0.0"
-          }
-        },
-        "string-width": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-          "requires": {
-            "is-fullwidth-code-point": "2.0.0",
-            "strip-ansi": "4.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-          "requires": {
-            "ansi-regex": "3.0.0"
-          }
-        },
-        "strip-bom": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM="
-        },
-        "yargs": {
-          "version": "9.0.1",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-9.0.1.tgz",
-          "integrity": "sha1-UqzCP+7Kw0BCB47njAwAf1CF20w=",
-          "requires": {
-            "camelcase": "4.1.0",
-            "cliui": "3.2.0",
-            "decamelize": "1.2.0",
-            "get-caller-file": "1.0.2",
-            "os-locale": "2.1.0",
-            "read-pkg-up": "2.0.0",
-            "require-directory": "2.1.1",
-            "require-main-filename": "1.0.1",
-            "set-blocking": "2.0.0",
-            "string-width": "2.1.1",
-            "which-module": "2.0.0",
-            "y18n": "3.2.1",
-            "yargs-parser": "7.0.0"
-          }
-        }
+        "yargs": "10.0.3"
       }
     },
     "signal-exit": {
@@ -10376,14 +10196,6 @@
         "once": "1.4.0",
         "unzip-response": "1.0.2",
         "xtend": "4.0.1"
-      },
-      "dependencies": {
-        "xtend": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-          "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
-          "dev": true
-        }
       }
     },
     "single-line-log": {
@@ -10393,6 +10205,19 @@
       "dev": true,
       "requires": {
         "string-width": "1.0.2"
+      },
+      "dependencies": {
+        "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.1.0",
+            "is-fullwidth-code-point": "1.0.0",
+            "strip-ansi": "3.0.1"
+          }
+        }
       }
     },
     "slash": {
@@ -10419,12 +10244,12 @@
       }
     },
     "sntp": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
-      "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz",
+      "integrity": "sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==",
       "dev": true,
       "requires": {
-        "hoek": "2.16.3"
+        "hoek": "4.2.0"
       }
     },
     "sockjs": {
@@ -10456,7 +10281,7 @@
         "faye-websocket": "0.11.1",
         "inherits": "2.0.3",
         "json3": "3.3.2",
-        "url-parse": "1.1.9"
+        "url-parse": "1.2.0"
       },
       "dependencies": {
         "debug": {
@@ -10495,24 +10320,22 @@
       "dev": true
     },
     "source-map": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-      "dev": true
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
     },
     "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,
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.0.tgz",
+      "integrity": "sha512-vUoN3I7fHQe0R/SJLKRdKYuEdRGogsviXFkHHo17AWaTGv17VLnxw+CFXvqy+y4ORZ3doWLQcxRYfwKrsd/H7Q==",
       "requires": {
-        "source-map": "0.5.7"
+        "source-map": "0.6.1"
       }
     },
     "sourcemapped-stacktrace": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/sourcemapped-stacktrace/-/sourcemapped-stacktrace-1.1.7.tgz",
-      "integrity": "sha512-pgHNUACbafkQ+M5zR00NSOtSKBc/i40prgN+SY07J/pghClwVNWNTTMa0JuXj4lriR2TvMKcPAHw5KN9tVFRhA==",
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/sourcemapped-stacktrace/-/sourcemapped-stacktrace-1.1.8.tgz",
+      "integrity": "sha512-OkVoI7GQOLl/laR1qsSo1c87tS8kF2VXhQq2SrQCDdXufBAcm8FgXogWso96ciMYoDtTw1Dn70CVdwYzoYs6Pg==",
       "dev": true,
       "requires": {
         "source-map": "0.5.6"
@@ -10536,6 +10359,7 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz",
       "integrity": "sha1-SzBz2TP/UfORLwOsVRlJikFQ20A=",
+      "dev": true,
       "requires": {
         "spdx-license-ids": "1.2.2"
       }
@@ -10543,12 +10367,14 @@
     "spdx-expression-parse": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz",
-      "integrity": "sha1-m98vIOH0DtRH++JzJmGR/O1RYmw="
+      "integrity": "sha1-m98vIOH0DtRH++JzJmGR/O1RYmw=",
+      "dev": true
     },
     "spdx-license-ids": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz",
-      "integrity": "sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc="
+      "integrity": "sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc=",
+      "dev": true
     },
     "spdy": {
       "version": "3.4.7",
@@ -10598,36 +10424,6 @@
           "requires": {
             "ms": "2.0.0"
           }
-        },
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "2.3.3",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-          "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "1.0.0",
-            "process-nextick-args": "1.0.7",
-            "safe-buffer": "5.1.1",
-            "string_decoder": "1.0.3",
-            "util-deprecate": "1.0.2"
-          }
-        },
-        "string_decoder": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-          "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "5.1.1"
-          }
         }
       }
     },
@@ -10665,14 +10461,15 @@
         "getpass": "0.1.7",
         "jsbn": "0.1.1",
         "tweetnacl": "0.14.5"
-      },
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-          "dev": true
-        }
+      }
+    },
+    "ssri": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-5.0.0.tgz",
+      "integrity": "sha512-728D4yoQcQm1ooZvSbywLkV1RjfITZXh0oWrhM/lnsx3nAHx7LsRGJWB/YyvoceAYRq98xqbstiN4JBv1/wNHg==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "5.1.1"
       }
     },
     "stackframe": {
@@ -10700,38 +10497,6 @@
       "dev": true,
       "requires": {
         "readable-stream": "2.3.3"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "2.3.3",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-          "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "1.0.0",
-            "process-nextick-args": "1.0.7",
-            "safe-buffer": "5.1.1",
-            "string_decoder": "1.0.3",
-            "util-deprecate": "1.0.2"
-          }
-        },
-        "string_decoder": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-          "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "5.1.1"
-          }
-        }
       }
     },
     "stream-browserify": {
@@ -10742,38 +10507,6 @@
       "requires": {
         "inherits": "2.0.3",
         "readable-stream": "2.3.3"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "2.3.3",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-          "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "1.0.0",
-            "process-nextick-args": "1.0.7",
-            "safe-buffer": "5.1.1",
-            "string_decoder": "1.0.3",
-            "util-deprecate": "1.0.2"
-          }
-        },
-        "string_decoder": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-          "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "5.1.1"
-          }
-        }
       }
     },
     "stream-combiner": {
@@ -10785,6 +10518,16 @@
         "duplexer": "0.1.1"
       }
     },
+    "stream-each": {
+      "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.4.0",
+        "stream-shift": "1.0.0"
+      }
+    },
     "stream-http": {
       "version": "2.7.2",
       "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.7.2.tgz",
@@ -10796,60 +10539,56 @@
         "readable-stream": "2.3.3",
         "to-arraybuffer": "1.0.1",
         "xtend": "4.0.1"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "2.3.3",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-          "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "1.0.0",
-            "process-nextick-args": "1.0.7",
-            "safe-buffer": "5.1.1",
-            "string_decoder": "1.0.3",
-            "util-deprecate": "1.0.2"
-          }
-        },
-        "string_decoder": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-          "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "5.1.1"
-          }
-        },
-        "xtend": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-          "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
-          "dev": true
-        }
       }
     },
+    "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
+    },
     "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
     },
+    "string_decoder": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "5.1.1"
+      }
+    },
     "string-width": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
       "requires": {
-        "code-point-at": "1.1.0",
-        "is-fullwidth-code-point": "1.0.0",
-        "strip-ansi": "3.0.1"
+        "is-fullwidth-code-point": "2.0.0",
+        "strip-ansi": "4.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
+        },
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "requires": {
+            "ansi-regex": "3.0.0"
+          }
+        }
       }
     },
     "string.prototype.padend": {
@@ -10859,16 +10598,10 @@
       "dev": true,
       "requires": {
         "define-properties": "1.1.2",
-        "es-abstract": "1.8.2",
+        "es-abstract": "1.10.0",
         "function-bind": "1.1.1"
       }
     },
-    "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
-    },
     "stringstream": {
       "version": "0.0.5",
       "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
@@ -10913,9 +10646,9 @@
       "dev": true
     },
     "style-loader": {
-      "version": "0.19.0",
-      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.19.0.tgz",
-      "integrity": "sha512-9mx9sC9nX1dgP96MZOODpGC6l1RzQBITI2D5WJhu+wnbrSYVKLGuy14XJSLVQih/0GFrPpjelt+s//VcZQ2Evw==",
+      "version": "0.19.1",
+      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.19.1.tgz",
+      "integrity": "sha512-IRE+ijgojrygQi3rsqT0U4dd+UcPCqcVvauZpCnQrGAlEe+FUIyrK93bUDScamesjP08JlQNsFJU+KmPedP5Og==",
       "dev": true,
       "requires": {
         "loader-utils": "1.1.0",
@@ -10929,7 +10662,7 @@
       "dev": true,
       "requires": {
         "debug": "2.6.9",
-        "es6-promise": "4.1.1"
+        "es6-promise": "4.2.2"
       },
       "dependencies": {
         "debug": {
@@ -10983,9 +10716,9 @@
       }
     },
     "symbol-observable": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.4.tgz",
-      "integrity": "sha1-Kb9hXUqnEhvdiYsi1LP5vE4qoD0="
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.1.0.tgz",
+      "integrity": "sha512-dQoid9tqQ+uotGhuTKEY11X4xhyYePVnqGSoSm3OGKh2E8LZ6RPULp1uXTctk33IeERlrRJYoVSBglsL05F5Uw=="
     },
     "table": {
       "version": "4.0.2",
@@ -10993,39 +10726,21 @@
       "integrity": "sha512-UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==",
       "dev": true,
       "requires": {
-        "ajv": "5.3.0",
-        "ajv-keywords": "2.1.0",
+        "ajv": "5.5.2",
+        "ajv-keywords": "2.1.1",
         "chalk": "2.3.0",
         "lodash": "4.17.4",
         "slice-ansi": "1.0.0",
         "string-width": "2.1.1"
       },
       "dependencies": {
-        "ajv": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.3.0.tgz",
-          "integrity": "sha1-RBT/dKUIecII7l/cgm4ywwNUnto=",
-          "dev": true,
-          "requires": {
-            "co": "4.6.0",
-            "fast-deep-equal": "1.0.0",
-            "fast-json-stable-stringify": "2.0.0",
-            "json-schema-traverse": "0.3.1"
-          }
-        },
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-          "dev": true
-        },
         "ansi-styles": {
           "version": "3.2.0",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
           "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
           "dev": true,
           "requires": {
-            "color-convert": "1.9.0"
+            "color-convert": "1.9.1"
           }
         },
         "chalk": {
@@ -11039,37 +10754,6 @@
             "supports-color": "4.5.0"
           }
         },
-        "has-flag": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-          "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-          "dev": true
-        },
-        "string-width": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-          "dev": true,
-          "requires": {
-            "is-fullwidth-code-point": "2.0.0",
-            "strip-ansi": "4.0.0"
-          }
-        },
-        "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"
-          }
-        },
         "supports-color": {
           "version": "4.5.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
@@ -11106,70 +10790,32 @@
       "requires": {
         "chownr": "1.0.1",
         "mkdirp": "0.5.1",
-        "pump": "1.0.2",
-        "tar-stream": "1.5.4"
+        "pump": "1.0.3",
+        "tar-stream": "1.5.5"
       }
     },
     "tar-stream": {
-      "version": "1.5.4",
-      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.4.tgz",
-      "integrity": "sha1-NlSc8E7RrumyowwBQyUiONr5QBY=",
+      "version": "1.5.5",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.5.tgz",
+      "integrity": "sha512-mQdgLPc/Vjfr3VWqWbfxW8yQNiJCbAZ+Gf6GDu1Cy0bdb33ofyiNGBtAY96jHFhDuivCwgW1H9DgTON+INiXgg==",
       "dev": true,
       "requires": {
         "bl": "1.2.1",
         "end-of-stream": "1.4.0",
         "readable-stream": "2.3.3",
         "xtend": "4.0.1"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "2.3.3",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-          "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "1.0.0",
-            "process-nextick-args": "1.0.7",
-            "safe-buffer": "5.1.1",
-            "string_decoder": "1.0.3",
-            "util-deprecate": "1.0.2"
-          }
-        },
-        "string_decoder": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-          "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "5.1.1"
-          }
-        },
-        "xtend": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-          "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
-          "dev": true
-        }
       }
     },
     "temp-file": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/temp-file/-/temp-file-2.0.3.tgz",
-      "integrity": "sha512-qN0iNW0DFNmog1BFS8J3rQK4sZRIqqUZJ/zFlFo+0PwE7adUTEpPrQ3toWxwTcDjtGL9HjsQWe8CqMKq1kM7Gw==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/temp-file/-/temp-file-3.0.0.tgz",
+      "integrity": "sha512-WaSZQMckvo975nF1fSv05Nuya63AiLtyn0oYURF1xw1BF092CpIXgRv/Y0vQeocL5pv4ouVsBOnTCoK4kAK2uQ==",
       "dev": true,
       "requires": {
         "async-exit-hook": "2.0.1",
         "bluebird-lst": "1.0.5",
-        "fs-extra-p": "4.4.4",
-        "lazy-val": "1.0.2"
+        "fs-extra-p": "4.5.0",
+        "lazy-val": "1.0.3"
       }
     },
     "term-size": {
@@ -11200,13 +10846,13 @@
       "dev": true
     },
     "through2": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-0.2.3.tgz",
-      "integrity": "sha1-6zKE2k6jEbbMis42U3SKUqvyWj8=",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
+      "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
       "dev": true,
       "requires": {
-        "readable-stream": "1.1.14",
-        "xtend": "2.1.2"
+        "readable-stream": "2.3.3",
+        "xtend": "4.0.1"
       }
     },
     "thunky": {
@@ -11258,15 +10904,15 @@
       "dev": true
     },
     "toposort": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/toposort/-/toposort-1.0.3.tgz",
-      "integrity": "sha1-8CzYp0vYvi/A6YYRw7rLlaFxhpw=",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/toposort/-/toposort-1.0.6.tgz",
+      "integrity": "sha1-wxdI5V0hDv/AD9zcfW5o19e7nOw=",
       "dev": true
     },
     "tough-cookie": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz",
-      "integrity": "sha1-8IH3bkyFcg5sN6X6ztc3FQ2EByo=",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz",
+      "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=",
       "dev": true,
       "requires": {
         "punycode": "1.4.1"
@@ -11281,9 +10927,9 @@
       }
     },
     "tree-kill": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.1.0.tgz",
-      "integrity": "sha1-yWPc8DciiS7FnLpWnpQLcZVNFyk=",
+      "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
     },
     "trim-newlines": {
@@ -11298,6 +10944,30 @@
       "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
       "dev": true
     },
+    "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"
+      },
+      "dependencies": {
+        "glob": {
+          "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.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
+          }
+        }
+      }
+    },
     "truncate-utf8-bytes": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz",
@@ -11307,12 +10977,6 @@
         "utf8-byte-length": "1.0.4"
       }
     },
-    "tryit": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/tryit/-/tryit-1.0.3.tgz",
-      "integrity": "sha1-OTvnMKlEb9Hq1tpZoBQwjzbCics=",
-      "dev": true
-    },
     "tty-browserify": {
       "version": "0.0.0",
       "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
@@ -11366,24 +11030,24 @@
       "dev": true
     },
     "ua-parser-js": {
-      "version": "0.7.14",
-      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.14.tgz",
-      "integrity": "sha1-EQ1T+kw/MmwSEpK76skE0uAzh8o="
+      "version": "0.7.17",
+      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.17.tgz",
+      "integrity": "sha512-uRdSdu1oA1rncCQL7sCj8vSyZkgtL7faaw9Tc9rZ3mGgraQ7+Pdx7w5mnOSF3gw9ZNG6oc+KXfkon3bKuROm0g=="
     },
     "uglify-js": {
-      "version": "3.0.28",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.28.tgz",
-      "integrity": "sha512-0h/qGay016GG2lVav3Kz174F3T2Vjlz2v6HCt+WDQpoXfco0hWwF5gHK9yh88mUYvIC+N7Z8NT8WpjSp1yoqGA==",
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.2.tgz",
+      "integrity": "sha512-uZp2gduFfZDDfx0iIAmfKgRTANCooWcFjnFmJ2n8x/+RpBNk97lac1HU5wvZxWZCBbwHmTFDpWAsEhKnQpsM2A==",
       "dev": true,
       "requires": {
-        "commander": "2.11.0",
-        "source-map": "0.5.7"
+        "commander": "2.12.2",
+        "source-map": "0.6.1"
       },
       "dependencies": {
         "commander": {
-          "version": "2.11.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz",
-          "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==",
+          "version": "2.12.2",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.12.2.tgz",
+          "integrity": "sha512-BFnaq5ZOGcDN7FlrtBT4xxkgIToalIIxwjxLWVJ8bGTpe1LroqMiqQXdA7ygc7CRvaYS+9zfPGFnJqFSayx+AA==",
           "dev": true
         }
       }
@@ -11403,7 +11067,7 @@
       "requires": {
         "source-map": "0.5.7",
         "uglify-js": "2.8.29",
-        "webpack-sources": "1.0.1"
+        "webpack-sources": "1.1.0"
       },
       "dependencies": {
         "camelcase": {
@@ -11423,6 +11087,12 @@
             "wordwrap": "0.0.2"
           }
         },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true
+        },
         "uglify-js": {
           "version": "2.8.29",
           "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz",
@@ -11475,6 +11145,24 @@
       "integrity": "sha1-/+3ks2slKQaW5uFl1KWe25mOawI=",
       "dev": true
     },
+    "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"
+      }
+    },
+    "unique-slug": {
+      "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"
+      }
+    },
     "unique-string": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz",
@@ -11512,7 +11200,7 @@
       "integrity": "sha1-TognpruRUUCrCTVZ1wFOPruDdFE=",
       "dev": true,
       "requires": {
-        "boxen": "1.2.2",
+        "boxen": "1.3.0",
         "chalk": "2.3.0",
         "configstore": "3.1.1",
         "import-lazy": "2.1.0",
@@ -11529,7 +11217,7 @@
           "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
           "dev": true,
           "requires": {
-            "color-convert": "1.9.0"
+            "color-convert": "1.9.1"
           }
         },
         "chalk": {
@@ -11543,12 +11231,6 @@
             "supports-color": "4.5.0"
           }
         },
-        "has-flag": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-          "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
-          "dev": true
-        },
         "supports-color": {
           "version": "4.5.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
@@ -11576,9 +11258,9 @@
       }
     },
     "url-parse": {
-      "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.1.9.tgz",
-      "integrity": "sha1-xn8dd11R8KGJEd17P/rSe7nlvRk=",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.2.0.tgz",
+      "integrity": "sha512-DT1XbYAfmQP65M/mE6OALxmXzZ/z1+e5zk2TcSKe/KiYbNGZxgtttzC0mR/sjopbpOXcbniq7eIKmocJnUWlEw==",
       "dev": true,
       "requires": {
         "querystringify": "1.0.0",
@@ -11662,6 +11344,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
       "integrity": "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w=",
+      "dev": true,
       "requires": {
         "spdx-correct": "1.0.2",
         "spdx-expression-parse": "1.0.4"
@@ -11693,14 +11376,6 @@
         "assert-plus": "1.0.0",
         "core-util-is": "1.0.2",
         "extsprintf": "1.3.0"
-      },
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-          "dev": true
-        }
       }
     },
     "vm-browserify": {
@@ -11726,7 +11401,7 @@
       "integrity": "sha1-ShRyvLuVK9Cpu0A2gB+VTfs5+qw=",
       "dev": true,
       "requires": {
-        "async": "2.4.1",
+        "async": "2.6.0",
         "chokidar": "1.7.0",
         "graceful-fs": "4.1.11"
       }
@@ -11741,71 +11416,35 @@
       }
     },
     "webpack": {
-      "version": "3.8.1",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-3.8.1.tgz",
-      "integrity": "sha512-5ZXLWWsMqHKFr5y0N3Eo5IIisxeEeRAajNq4mELb/WELOR7srdbQk2N5XiyNy2A/AgvlR3AmeBCZJW8lHrolbw==",
+      "version": "3.10.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-3.10.0.tgz",
+      "integrity": "sha512-fxxKXoicjdXNUMY7LIdY89tkJJJ0m1Oo8PQutZ5rLgWbV5QVKI15Cn7+/IHnRTd3vfKfiwBx6SBqlorAuNA8LA==",
       "dev": true,
       "requires": {
-        "acorn": "5.1.2",
+        "acorn": "5.2.1",
         "acorn-dynamic-import": "2.0.2",
-        "ajv": "5.3.0",
-        "ajv-keywords": "2.1.0",
-        "async": "2.4.1",
+        "ajv": "5.5.2",
+        "ajv-keywords": "2.1.1",
+        "async": "2.6.0",
         "enhanced-resolve": "3.4.1",
         "escope": "3.6.0",
-        "interpret": "1.0.4",
+        "interpret": "1.1.0",
         "json-loader": "0.5.7",
         "json5": "0.5.1",
         "loader-runner": "2.3.0",
         "loader-utils": "1.1.0",
         "memory-fs": "0.4.1",
         "mkdirp": "0.5.1",
-        "node-libs-browser": "2.0.0",
+        "node-libs-browser": "2.1.0",
         "source-map": "0.5.7",
         "supports-color": "4.5.0",
         "tapable": "0.2.8",
         "uglifyjs-webpack-plugin": "0.4.6",
         "watchpack": "1.4.0",
-        "webpack-sources": "1.0.1",
+        "webpack-sources": "1.1.0",
         "yargs": "8.0.2"
       },
       "dependencies": {
-        "ajv": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.3.0.tgz",
-          "integrity": "sha1-RBT/dKUIecII7l/cgm4ywwNUnto=",
-          "dev": true,
-          "requires": {
-            "co": "4.6.0",
-            "fast-deep-equal": "1.0.0",
-            "fast-json-stable-stringify": "2.0.0",
-            "json-schema-traverse": "0.3.1"
-          }
-        },
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-          "dev": true
-        },
-        "camelcase": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
-          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-          "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-          "dev": true
-        },
         "load-json-file": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
@@ -11827,6 +11466,12 @@
             "pify": "2.3.0"
           }
         },
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        },
         "read-pkg": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
@@ -11848,24 +11493,11 @@
             "read-pkg": "2.0.0"
           }
         },
-        "string-width": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-          "dev": true,
-          "requires": {
-            "is-fullwidth-code-point": "2.0.0",
-            "strip-ansi": "4.0.0"
-          }
-        },
-        "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"
-          }
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true
         },
         "strip-bom": {
           "version": "3.0.0",
@@ -11902,34 +11534,43 @@
             "y18n": "3.2.1",
             "yargs-parser": "7.0.0"
           }
+        },
+        "yargs-parser": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz",
+          "integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=",
+          "dev": true,
+          "requires": {
+            "camelcase": "4.1.0"
+          }
         }
       }
     },
     "webpack-dev-middleware": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-1.12.0.tgz",
-      "integrity": "sha1-007++y7dp+HTtdvgcolRMhllFwk=",
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-1.12.2.tgz",
+      "integrity": "sha512-FCrqPy1yy/sN6U/SaEZcHKRXGlqU0DUaEBL45jkUYoB8foVb6wCnbIJ1HKIx+qUFTW+3JpVcCJCxZ8VATL4e+A==",
       "dev": true,
       "requires": {
         "memory-fs": "0.4.1",
-        "mime": "1.4.1",
+        "mime": "1.6.0",
         "path-is-absolute": "1.0.1",
         "range-parser": "1.2.0",
         "time-stamp": "2.0.0"
       },
       "dependencies": {
         "mime": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
-          "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==",
+          "version": "1.6.0",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+          "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
           "dev": true
         }
       }
     },
     "webpack-dev-server": {
-      "version": "2.9.3",
-      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-2.9.3.tgz",
-      "integrity": "sha512-bwq7sj452FRH+oVfgOA8xXKkLYPTNsYB4dQ0Jhz3ydjNJ9MvhpGJtehFW8Z0cEcwNkRRiF4aYbReiSGQ4pbS1w==",
+      "version": "2.9.7",
+      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-2.9.7.tgz",
+      "integrity": "sha512-Pu7uoQFgQj5RE5wmlfkpYSzihMKxulwEuO2xCsaMnAnyRSApwoVi3B8WCm9XbigyWTHaIMzYGkB90Vr6leAeTQ==",
       "dev": true,
       "requires": {
         "ansi-html": "0.0.7",
@@ -11937,7 +11578,7 @@
         "bonjour": "3.5.0",
         "chokidar": "1.7.0",
         "compression": "1.7.1",
-        "connect-history-api-fallback": "1.4.0",
+        "connect-history-api-fallback": "1.5.0",
         "debug": "3.1.0",
         "del": "3.0.0",
         "express": "4.16.2",
@@ -11946,7 +11587,8 @@
         "import-local": "0.1.1",
         "internal-ip": "1.2.0",
         "ip": "1.1.5",
-        "loglevel": "1.5.1",
+        "killable": "1.0.0",
+        "loglevel": "1.6.0",
         "opn": "5.1.0",
         "portfinder": "1.0.13",
         "selfsigned": "1.10.1",
@@ -11956,7 +11598,7 @@
         "spdy": "3.4.7",
         "strip-ansi": "3.0.1",
         "supports-color": "4.5.0",
-        "webpack-dev-middleware": "1.12.0",
+        "webpack-dev-middleware": "1.12.2",
         "yargs": "6.6.0"
       },
       "dependencies": {
@@ -11966,15 +11608,6 @@
           "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
           "dev": true
         },
-        "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"
-          }
-        },
         "del": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/del/-/del-3.0.0.tgz",
@@ -12010,12 +11643,6 @@
             }
           }
         },
-        "has-flag": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-          "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
-          "dev": true
-        },
         "os-locale": {
           "version": "1.4.0",
           "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
@@ -12025,11 +11652,16 @@
             "lcid": "1.0.0"
           }
         },
-        "pify": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-          "dev": true
+        "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.1.0",
+            "is-fullwidth-code-point": "1.0.0",
+            "strip-ansi": "3.0.1"
+          }
         },
         "supports-color": {
           "version": "4.5.0",
@@ -12085,13 +11717,13 @@
       "dev": true
     },
     "webpack-sources": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.0.1.tgz",
-      "integrity": "sha512-05tMxipUCwHqYaVS8xc7sYPTly8PzXayRCB4dTxLhWTqlKUiwH6ezmEe0OSreL1c30LAuA3Zqmc+uEBUGFJDjw==",
+      "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.5.7"
+        "source-map": "0.6.1"
       }
     },
     "websocket-driver": {
@@ -12101,13 +11733,13 @@
       "dev": true,
       "requires": {
         "http-parser-js": "0.4.9",
-        "websocket-extensions": "0.1.2"
+        "websocket-extensions": "0.1.3"
       }
     },
     "websocket-extensions": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.2.tgz",
-      "integrity": "sha1-Dhh4HeYpoYMIzhSBZQ9n/6JpOl0=",
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz",
+      "integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==",
       "dev": true
     },
     "whatwg-fetch": {
@@ -12141,15 +11773,28 @@
       "dev": true,
       "requires": {
         "string-width": "1.0.2"
+      },
+      "dependencies": {
+        "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.1.0",
+            "is-fullwidth-code-point": "1.0.0",
+            "strip-ansi": "3.0.1"
+          }
+        }
       }
     },
     "widest-line": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-1.0.0.tgz",
-      "integrity": "sha1-DAnIXCqUaD0Nfq+O4JfVZL8OEFw=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-2.0.0.tgz",
+      "integrity": "sha1-AUKk6KJD+IgsAjOqDgKBqnYVInM=",
       "dev": true,
       "requires": {
-        "string-width": "1.0.2"
+        "string-width": "2.1.1"
       }
     },
     "window-size": {
@@ -12159,9 +11804,9 @@
       "dev": true
     },
     "winreg": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/winreg/-/winreg-1.2.2.tgz",
-      "integrity": "sha1-hQmvo7ccW70RCm18YkfsZ3NsWY8="
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/winreg/-/winreg-1.2.4.tgz",
+      "integrity": "sha1-ugZWKbepJRMOFXeRCM9UCZDpjRs="
     },
     "wordwrap": {
       "version": "1.0.0",
@@ -12176,6 +11821,18 @@
       "requires": {
         "string-width": "1.0.2",
         "strip-ansi": "3.0.1"
+      },
+      "dependencies": {
+        "string-width": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+          "requires": {
+            "code-point-at": "1.1.0",
+            "is-fullwidth-code-point": "1.0.0",
+            "strip-ansi": "3.0.1"
+          }
+        }
       }
     },
     "wrappy": {
@@ -12228,13 +11885,10 @@
       "dev": true
     },
     "xtend": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz",
-      "integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=",
-      "dev": true,
-      "requires": {
-        "object-keys": "0.4.0"
-      }
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
+      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
+      "dev": true
     },
     "y18n": {
       "version": "3.2.1",
@@ -12250,7 +11904,6 @@
       "version": "10.0.3",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-10.0.3.tgz",
       "integrity": "sha512-DqBpQ8NAUX4GyPP/ijDGHsJya4tYqLQrjPr95HNsr1YwL3+daCfvBwg7+gIC6IdJhR2kATh3hb61vjzMWEtjdw==",
-      "dev": true,
       "requires": {
         "cliui": "3.2.0",
         "decamelize": "1.2.0",
@@ -12263,70 +11916,15 @@
         "string-width": "2.1.1",
         "which-module": "2.0.0",
         "y18n": "3.2.1",
-        "yargs-parser": "8.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-          "dev": true
-        },
-        "camelcase": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
-          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-          "dev": true
-        },
-        "string-width": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-          "dev": true,
-          "requires": {
-            "is-fullwidth-code-point": "2.0.0",
-            "strip-ansi": "4.0.0"
-          }
-        },
-        "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"
-          }
-        },
-        "yargs-parser": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-8.0.0.tgz",
-          "integrity": "sha1-IdR2Mw5agieaS4gTRb8GYQLiGcY=",
-          "dev": true,
-          "requires": {
-            "camelcase": "4.1.0"
-          }
-        }
+        "yargs-parser": "8.1.0"
       }
     },
     "yargs-parser": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz",
-      "integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-8.1.0.tgz",
+      "integrity": "sha512-yP+6QqN8BmrgW2ggLtTbdrOyBNSI7zBa4IykmiV5R1wl1JWNxQvWhMfMdmzIYtKU7oP3OOInY/tl2ov3BDjnJQ==",
       "requires": {
         "camelcase": "4.1.0"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
-          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0="
-        }
       }
     },
     "yauzl": {
diff --git a/package.json b/package.json
index c3a57fd8..3f65b2a3 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "main": "./build/app/app.js",
   "description": "An open source cross platform desktop application for devRant",
   "scripts": {
-    "lint": "eslint --ext .jsx,.js app/src/js",
+    "lint": "eslint --ext .jsx,.js app/src/js --fix",
     "build": "cross-env NODE_ENV=production webpack --progress --color --profile --config ./webpack/prod.config.js",
     "pack": "electron-builder --dir",
     "dist": "electron-builder",
@@ -77,69 +77,69 @@
   ],
   "devDependencies": {
     "babel-core": "^6.26.0",
-    "babel-eslint": "^8.0.1",
+    "babel-eslint": "^8.1.2",
     "babel-loader": "^7.1.2",
     "babel-minify-webpack-plugin": "^0.2.0",
     "babel-preset-es2015": "^6.24.1",
     "babel-preset-react": "^6.24.1",
     "babel-preset-stage-1": "^6.24.1",
-    "compression-webpack-plugin": "^1.0.1",
-    "concurrently": "^3.5.0",
-    "copy-webpack-plugin": "^4.2.0",
-    "cross-env": "^5.1.0",
+    "compression-webpack-plugin": "^1.1.3",
+    "concurrently": "^3.5.1",
+    "copy-webpack-plugin": "^4.3.1",
+    "cross-env": "^5.1.3",
     "css-loader": "^0.28.7",
-    "electron": "^1.7.9",
-    "electron-builder": "^19.41.0",
+    "electron": "^1.7.10",
+    "electron-builder": "^19.49.2",
     "env-paths": "^1.0.0",
-    "eslint": "^4.8.0",
-    "eslint-config-airbnb": "^15.1.0",
+    "eslint": "^4.14.0",
+    "eslint-config-airbnb": "^16.1.0",
     "eslint-plugin-import": "^2.8.0",
-    "eslint-plugin-jsx-a11y": "^6.0.2",
-    "eslint-plugin-react": "^7.4.0",
+    "eslint-plugin-jsx-a11y": "^6.0.3",
+    "eslint-plugin-react": "^7.5.1",
     "extract-text-webpack-plugin": "^3.0.2",
     "html-webpack-plugin": "^2.30.1",
-    "node-sass": "^4.5.3",
-    "npm-run-all": "^4.1.1",
-    "react-hot-loader": "^3.1.1",
+    "node-sass": "^4.7.2",
+    "npm-run-all": "^4.1.2",
+    "react-hot-loader": "^3.1.3",
     "redux-logger": "^3.0.6",
     "rimraf": "^2.6.2",
     "sass-lint": "^1.12.1",
     "sass-loader": "^6.0.6",
-    "style-loader": "^0.19.0",
-    "webpack": "^3.8.1",
-    "webpack-dev-server": "^2.9.3",
+    "style-loader": "^0.19.1",
+    "webpack": "^3.10.0",
+    "webpack-dev-server": "^2.9.7",
     "webpack-node-externals": "^1.6.0"
   },
   "dependencies": {
-    "auto-launch": "^5.0.1",
-    "autolinker": "^1.4.4",
-    "deepmerge": "^2.0.0",
-    "dompurify": "^1.0.2",
-    "electron-devtools-installer": "^2.2.1",
-    "electron-settings": "^3.1.3",
-    "electron-updater": "^2.15.0",
+    "auto-launch": "^5.0.5",
+    "autolinker": "^1.6.0",
+    "deepmerge": "^2.0.1",
+    "dompurify": "^1.0.3",
+    "electron-devtools-installer": "^2.2.3",
+    "electron-settings": "^3.1.4",
+    "electron-updater": "^2.17.6",
     "fuse.js": "^3.2.0",
     "jquery": "^3.2.1",
     "json-schema-traverse": "^0.3.1",
     "node-notifier": "^5.1.2",
     "prop-types": "^15.6.0",
     "rantscript": "^1.4.0",
-    "react": "^16.0.0",
-    "react-dom": "^16.0.0",
+    "react": "^16.2.0",
+    "react-dom": "^16.2.0",
     "react-redux": "^5.0.6",
     "react-router": "^4.2.0",
     "react-router-dom": "^4.2.2",
-    "react-transition-group": "^1.2.0",
+    "react-transition-group": "^1.2.1",
     "react-twemoji": "0.0.8",
     "redux": "^3.7.2",
     "redux-thunk": "^2.2.0",
     "semver-compare": "^1.0.0",
-    "showdown": "^1.8.0",
+    "showdown": "^1.8.6",
     "twemoji": "^2.5.0"
   },
   "optionalDependencies": {
     "7zip-bin-mac": "^1.0.1",
-    "7zip-bin-linux": "^1.1.0",
+    "7zip-bin-linux": "^1.2.0",
     "7zip-bin-win": "^2.1.1"
   }
 }

From 1aa5e244ec7a6882d2bdd2d9b8459b28b50f2722 Mon Sep 17 00:00:00 2001
From: Tahnik Mustasin <tahnik@live.co.uk>
Date: Thu, 28 Dec 2017 18:56:13 +0000
Subject: [PATCH 02/63] Setup the structure of the theme

---
 .eslintrc.json                             |  1 +
 app/src/js/actions/settings.js             | 10 +++-
 app/src/js/components/settings/settings.js |  7 ++-
 app/src/js/components/settings/theme.js    | 69 ++++++++++++++++++++--
 app/src/js/consts/default_states.js        | 22 +------
 app/src/js/consts/types.js                 | 44 ++++++++++++++
 app/src/js/containers/settings/settings.js |  6 +-
 app/src/js/reducers/settings.js            | 11 +++-
 app/src/res/sass/modules/settings.sass     | 16 ++++-
 9 files changed, 152 insertions(+), 34 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index 8ca44e5d..985bc0cb 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -33,6 +33,7 @@
     "jsx-a11y/no-static-element-interactions": 0,
     "jsx-a11y/no-noninteractive-element-interactions": 0,
     "jsx-a11y/href-no-hash": "off",
+    "jsx-a11y/click-events-have-key-events": "off",
     "jsx-a11y/anchor-is-valid": ["warn", { "aspects": ["invalidHref"] }],
 		"import/no-dynamic-require": 0,
 		"import/no-extraneous-dependencies": "off",
diff --git a/app/src/js/actions/settings.js b/app/src/js/actions/settings.js
index 5b0947b6..ae920b43 100644
--- a/app/src/js/actions/settings.js
+++ b/app/src/js/actions/settings.js
@@ -1,4 +1,4 @@
-import { SETTINGS, ITEM } from '../consts/types';
+import { SETTINGS, ITEM, THEMES } from '../consts/types';
 import { fetchUser } from './user';
 import { fetchNotifs } from './notifs';
 import { openModal } from './modal';
@@ -187,8 +187,12 @@ const changeGeneral = (primaryKey, secondaryKey, value) => (dispatch) => {
  * We will use this for theming in future
  *
  */
-const changeTheme = () => () => {
-
+const changeTheme = (key, values = null) => (dispatch) => {
+  dispatch({
+    type: SETTINGS.ACTION.CHANGE_THEME,
+    key: values ? null : key,
+    values,
+  });
 };
 
 
diff --git a/app/src/js/components/settings/settings.js b/app/src/js/components/settings/settings.js
index 7a421248..47c05bb3 100644
--- a/app/src/js/components/settings/settings.js
+++ b/app/src/js/components/settings/settings.js
@@ -17,13 +17,15 @@ class Items extends Component {
   }
   getSettings() {
     const { activeNav } = this.state;
-    const { settings, changeGeneral, theme } = this.props;
+    const {
+      settings, changeGeneral, theme,
+    } = this.props;
     if (activeNav === SETTINGS_NAV[0]) {
       return (
         <General general={settings.general} changeGeneral={changeGeneral} />
       );
     } else if (activeNav === SETTINGS_NAV[1]) {
-      return <Theme theme={theme} />;
+      return <Theme theme={theme} {...this.props} />;
     }
     return <General />;
   }
@@ -53,6 +55,7 @@ Items.propTypes = {
   settings: PropTypes.object.isRequired,
   changeGeneral: PropTypes.func.isRequired,
   theme: PropTypes.object.isRequired,
+  auth: PropTypes.object.isRequired,
 };
 
 export default Items;
diff --git a/app/src/js/components/settings/theme.js b/app/src/js/components/settings/theme.js
index 05e30729..eb43cf30 100644
--- a/app/src/js/components/settings/theme.js
+++ b/app/src/js/components/settings/theme.js
@@ -1,22 +1,79 @@
 import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import Twemoji from 'react-twemoji';
+import { timeSince } from '../../consts/utils';
+import { THEMES } from '../../consts/types';
 
 class Theme extends Component {
-  constructor(props) {
-    super(props);
-    this.state = {
-      Hel: '',
-    };
+  getTheme(key) {
+    const { theme } = this.props;
+    const selectedTheme = THEMES[key];
+    if (key === theme.id.toUpperCase()) {
+      // selectedTheme = THEMES[theme.id.toUpperCase()];
+    }
+    return (
+      <div
+        className="item_container"
+        style={{
+          backgroundColor: selectedTheme.backgroundColor,
+        }}
+        onClick={() => { this.props.changeTheme(key); }}
+      >
+        <div
+          className={`item_card ${1 ? null : 'shadow'}`}
+          id={1010101}
+          style={{
+              backgroundColor: selectedTheme.item_card.backgroundColor,
+              color: selectedTheme.item_card.color,
+              width: `${selectedTheme.column.width}px`,
+            }}
+        >
+          <span
+            className="timesince"
+          >{timeSince(1514319457 * 1000)}
+          </span>
+          <div
+            className="body_container"
+            onClick={() => this.open()}
+          >
+            <div
+              className="top_container"
+            >
+              <Twemoji>
+                <span
+                  className="body"
+                >
+                  Bro ipsum dolor sit amet sucker hole heli granny gear, newschooler McTwist cruiser wheelie drop taco mitt. Bomb hole Skate avie carve grind line. Bro clipless table top whip glades pow pow poaching avie wack. 180 wheelie corduroy table top schwag shred.
+                  Chillax flow pow pow steeps granny gear. Crank grind rigid sketching. Manny hero stomp bowl rock roll, pinner granny gear dust on crust reverse camber hardtail. Clean air avie euro death cookies, face shots japan air brain bucket sketching presta.
+                  Death cookies first tracks ski bum T-bar 360. Wheelie deck afterbang rail table top gapers. Whistler nose dust on crust stoked pipe endo. Heli pow rock roll, schwag sketching gaper noodle road rash laps free ride gnar gnar frozen chicken heads rigid avie.
+                </span>
+              </Twemoji>
+            </div>
+          </div>
+        </div>
+      </div>
+    );
+  }
+  getThemes() {
+    return Object.keys(THEMES).map(key => this.getTheme(key));
   }
   render() {
     return (
       <div className="theme_container">
-        Coming soon!
+        <div className="items_container">
+          { this.getThemes() }
+        </div>
+        <div className="custom_theme">
+          <h4>Global</h4>
+        </div>
       </div>
     );
   }
 }
 
 Theme.propTypes = {
+  theme: PropTypes.object.isRequired,
+  changeTheme: PropTypes.func.isRequired,
 };
 
 export default Theme;
diff --git a/app/src/js/consts/default_states.js b/app/src/js/consts/default_states.js
index 3880e304..9ded4b7b 100644
--- a/app/src/js/consts/default_states.js
+++ b/app/src/js/consts/default_states.js
@@ -1,4 +1,4 @@
-import { STATE, FEED, SETTINGS } from './types';
+import { STATE, FEED, SETTINGS, THEMES } from './types';
 import { getUID } from './utils';
 
 /*
@@ -16,25 +16,7 @@ export default {
   },
   notifs: null,
   settings: {
-    theme: {
-      name: 'Dark Theme',
-      backgroundColor: '#54556E',
-      item_card: {
-        backgroundColor: '#40415A',
-        color: 'white',
-      },
-      comment_card: {
-        backgroundColor: '#40415A',
-        color: 'white',
-      },
-      column: {
-        backgroundColor: '#54556E',
-        width: '450',
-      },
-      user_badge: {
-        details_back: '#54556E',
-      },
-    },
+    theme: THEMES.DARK_THEME,
     general: {
       filterRants: {
         title: 'Filter Rants',
diff --git a/app/src/js/consts/types.js b/app/src/js/consts/types.js
index a053e231..4e382188 100644
--- a/app/src/js/consts/types.js
+++ b/app/src/js/consts/types.js
@@ -41,6 +41,50 @@ export const SETTINGS = {
   },
   ACTION: {
     CHANGE_GENERAL: 'CHANGE_GENERAL',
+    CHANGE_THEME: 'CHANGE_THEME',
+  },
+};
+
+export const THEMES = {
+  DARK_THEME: {
+    name: 'Dark Theme',
+    id: 'dark_theme',
+    backgroundColor: '#54556E',
+    item_card: {
+      backgroundColor: '#40415A',
+      color: 'white',
+    },
+    comment_card: {
+      backgroundColor: '#40415A',
+      color: 'white',
+    },
+    column: {
+      backgroundColor: '#54556E',
+      width: '450',
+    },
+    user_badge: {
+      details_back: '#54556E',
+    },
+  },
+  LIGHT_THEME: {
+    name: 'Light Theme',
+    id: 'light_theme',
+    backgroundColor: '#94556E',
+    item_card: {
+      backgroundColor: '#40415A',
+      color: 'white',
+    },
+    comment_card: {
+      backgroundColor: '#40415A',
+      color: 'white',
+    },
+    column: {
+      backgroundColor: '#54556E',
+      width: '450',
+    },
+    user_badge: {
+      details_back: '#54556E',
+    },
   },
 };
 
diff --git a/app/src/js/containers/settings/settings.js b/app/src/js/containers/settings/settings.js
index 22d775c2..db55b4ea 100644
--- a/app/src/js/containers/settings/settings.js
+++ b/app/src/js/containers/settings/settings.js
@@ -1,17 +1,21 @@
 import { connect } from 'react-redux';
 import Settings from '../../components/settings/settings';
-import { changeGeneral } from '../../actions/settings';
+import { changeGeneral, changeTheme } from '../../actions/settings';
 
 
 const mapDispatchToProps = dispatch => ({
   changeGeneral: (primarykey, secondaryKey, value) => {
     dispatch(changeGeneral(primarykey, secondaryKey, value));
   },
+  changeTheme: (key, value = null) => {
+    dispatch(changeTheme(key, value));
+  },
 });
 
 const mapStateToProps = state => ({
   settings: state.settings,
   theme: state.settings.theme,
+  auth: state.auth,
 });
 
 
diff --git a/app/src/js/reducers/settings.js b/app/src/js/reducers/settings.js
index 1777bc6b..3f9985a5 100644
--- a/app/src/js/reducers/settings.js
+++ b/app/src/js/reducers/settings.js
@@ -1,5 +1,5 @@
 import DEFAULT_STATES from '../consts/default_states';
-import { SETTINGS } from '../consts/types';
+import { SETTINGS, THEMES } from '../consts/types';
 
 export default (state = DEFAULT_STATES.settings, action) => {
   switch (action.type) {
@@ -20,6 +20,15 @@ export default (state = DEFAULT_STATES.settings, action) => {
         general,
       };
     }
+    case SETTINGS.ACTION.CHANGE_THEME: {
+      const { key, values } = action;
+      let theme = { ...state.general };
+      theme = THEMES[key];
+      return {
+        ...state,
+        theme,
+      };
+    }
     default:
       return state;
   }
diff --git a/app/src/res/sass/modules/settings.sass b/app/src/res/sass/modules/settings.sass
index 60492d9b..da1db2f3 100644
--- a/app/src/res/sass/modules/settings.sass
+++ b/app/src/res/sass/modules/settings.sass
@@ -29,8 +29,22 @@
     .theme_container
       color: white
       display: flex
-      justify-content: center
       margin-top: 2rem
+      position: relative
+      .custom_theme
+        flex: 1
+      .items_container
+        flex: 1
+        display: flex
+        flex-direction: column
+        .item_container
+          cursor: pointer
+          margin: 0.5rem 0
+          padding: 1rem
+          .item_card
+            pointer-events: none
+            margin: 0
+            width: auto !important
     .general_container
       .version_number
         display: flex

From 1129c9039919ea4eb105349aa04f2ddda021986a Mon Sep 17 00:00:00 2001
From: RekkyRek <haslun16@edu.vilehlmina.se>
Date: Sun, 31 Dec 2017 15:13:40 +0100
Subject: [PATCH 03/63] Fixed #224

---
 app/src/js/components/item/bottom_bar.js |   2 +-
 package-lock.json                        | 918 +++++++++++++++++++++++
 2 files changed, 919 insertions(+), 1 deletion(-)

diff --git a/app/src/js/components/item/bottom_bar.js b/app/src/js/components/item/bottom_bar.js
index 781633c0..787be7f9 100644
--- a/app/src/js/components/item/bottom_bar.js
+++ b/app/src/js/components/item/bottom_bar.js
@@ -117,7 +117,7 @@ class BottomBar extends Component {
           <div className="togglable">
             <div
               className={`trigger ${this.state.triggerActive ? 'active' : ''}`}
-              onMouseEnter={() => this.setState({ triggerActive: true })}
+              onClick={() => this.setState({ triggerActive: true })}
             >
               <p><i className="ion-android-more-horizontal" /></p>
             </div>
diff --git a/package-lock.json b/package-lock.json
index 765eb6ca..5712c94c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,9 +15,23 @@
       "integrity": "sha512-+rr4OgeTNrLuJAf09o3USdttEYiXvZshWMkhD6wR9v1ieXH0JM1Q2yT41/cJuJcqiPpSXlM/g3aR+Y5MWQdr0Q==",
       "dev": true,
       "requires": {
+        "7zip-bin-linux": "1.2.0",
+        "7zip-bin-mac": "1.0.1",
         "7zip-bin-win": "2.1.1"
       }
     },
+    "7zip-bin-linux": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/7zip-bin-linux/-/7zip-bin-linux-1.2.0.tgz",
+      "integrity": "sha512-umB98LN18XBGKPw4EKET2zPDqVhEU1mxXA1Gx0BM+DoBt4hnlZPNkpSMNzmuNbQshi9SzLhqlTAyKcAgNrbV3Q==",
+      "optional": true
+    },
+    "7zip-bin-mac": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/7zip-bin-mac/-/7zip-bin-mac-1.0.1.tgz",
+      "integrity": "sha1-Pmh3i78JJq3GgVlCcHRQXUdVXAI=",
+      "optional": true
+    },
     "7zip-bin-win": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/7zip-bin-win/-/7zip-bin-win-2.1.1.tgz",
@@ -2497,6 +2511,7 @@
       "requires": {
         "anymatch": "1.3.2",
         "async-each": "1.0.1",
+        "fsevents": "1.1.3",
         "glob-parent": "2.0.0",
         "inherits": "2.0.3",
         "is-binary-path": "1.0.1",
@@ -5178,6 +5193,909 @@
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
     },
+    "fsevents": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.3.tgz",
+      "integrity": "sha512-WIr7iDkdmdbxu/Gh6eKEZJL6KPE74/5MEsf2whTOFNxbIoIixogroLdKYqB6FDav4Wavh/lZdzzd3b2KxIXC5Q==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "nan": "2.7.0",
+        "node-pre-gyp": "0.6.39"
+      },
+      "dependencies": {
+        "abbrev": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "ajv": {
+          "version": "4.11.8",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "co": "4.6.0",
+            "json-stable-stringify": "1.0.1"
+          }
+        },
+        "ansi-regex": {
+          "version": "2.1.1",
+          "bundled": true,
+          "dev": true
+        },
+        "aproba": {
+          "version": "1.1.1",
+          "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",
+            "readable-stream": "2.2.9"
+          }
+        },
+        "asn1": {
+          "version": "0.2.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "assert-plus": {
+          "version": "0.2.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "asynckit": {
+          "version": "0.4.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "aws-sign2": {
+          "version": "0.6.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "aws4": {
+          "version": "1.6.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "balanced-match": {
+          "version": "0.4.2",
+          "bundled": true,
+          "dev": true
+        },
+        "bcrypt-pbkdf": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "tweetnacl": "0.14.5"
+          }
+        },
+        "block-stream": {
+          "version": "0.0.9",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "inherits": "2.0.3"
+          }
+        },
+        "boom": {
+          "version": "2.10.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "hoek": "2.16.3"
+          }
+        },
+        "brace-expansion": {
+          "version": "1.1.7",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "balanced-match": "0.4.2",
+            "concat-map": "0.0.1"
+          }
+        },
+        "buffer-shims": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "caseless": {
+          "version": "0.12.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "co": {
+          "version": "4.6.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "code-point-at": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true
+        },
+        "combined-stream": {
+          "version": "1.0.5",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "delayed-stream": "1.0.0"
+          }
+        },
+        "concat-map": {
+          "version": "0.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "console-control-strings": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true
+        },
+        "core-util-is": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        },
+        "cryptiles": {
+          "version": "2.0.5",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "boom": "2.10.1"
+          }
+        },
+        "dashdash": {
+          "version": "1.14.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "assert-plus": "1.0.0"
+          },
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "debug": {
+          "version": "2.6.8",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "deep-extend": {
+          "version": "0.4.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "delayed-stream": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "delegates": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "detect-libc": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "ecc-jsbn": {
+          "version": "0.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "jsbn": "0.1.1"
+          }
+        },
+        "extend": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "extsprintf": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        },
+        "forever-agent": {
+          "version": "0.6.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "form-data": {
+          "version": "2.1.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "asynckit": "0.4.0",
+            "combined-stream": "1.0.5",
+            "mime-types": "2.1.15"
+          }
+        },
+        "fs.realpath": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "fstream": {
+          "version": "1.0.11",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "graceful-fs": "4.1.11",
+            "inherits": "2.0.3",
+            "mkdirp": "0.5.1",
+            "rimraf": "2.6.1"
+          }
+        },
+        "fstream-ignore": {
+          "version": "1.0.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "fstream": "1.0.11",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4"
+          }
+        },
+        "gauge": {
+          "version": "2.7.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "aproba": "1.1.1",
+            "console-control-strings": "1.1.0",
+            "has-unicode": "2.0.1",
+            "object-assign": "4.1.1",
+            "signal-exit": "3.0.2",
+            "string-width": "1.0.2",
+            "strip-ansi": "3.0.1",
+            "wide-align": "1.1.2"
+          }
+        },
+        "getpass": {
+          "version": "0.1.7",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "assert-plus": "1.0.0"
+          },
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "glob": {
+          "version": "7.1.2",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "fs.realpath": "1.0.0",
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
+          }
+        },
+        "graceful-fs": {
+          "version": "4.1.11",
+          "bundled": true,
+          "dev": true
+        },
+        "har-schema": {
+          "version": "1.0.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "har-validator": {
+          "version": "4.2.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ajv": "4.11.8",
+            "har-schema": "1.0.5"
+          }
+        },
+        "has-unicode": {
+          "version": "2.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "hawk": {
+          "version": "3.1.3",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "boom": "2.10.1",
+            "cryptiles": "2.0.5",
+            "hoek": "2.16.3",
+            "sntp": "1.0.9"
+          }
+        },
+        "hoek": {
+          "version": "2.16.3",
+          "bundled": true,
+          "dev": true
+        },
+        "http-signature": {
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "assert-plus": "0.2.0",
+            "jsprim": "1.4.0",
+            "sshpk": "1.13.0"
+          }
+        },
+        "inflight": {
+          "version": "1.0.6",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "once": "1.4.0",
+            "wrappy": "1.0.2"
+          }
+        },
+        "inherits": {
+          "version": "2.0.3",
+          "bundled": true,
+          "dev": true
+        },
+        "ini": {
+          "version": "1.3.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "number-is-nan": "1.0.1"
+          }
+        },
+        "is-typedarray": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "isarray": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "isstream": {
+          "version": "0.1.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "jodid25519": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "jsbn": "0.1.1"
+          }
+        },
+        "jsbn": {
+          "version": "0.1.1",
+          "bundled": true,
+          "dev": true
+        },
+        "json-schema": {
+          "version": "0.2.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "json-stable-stringify": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "jsonify": "0.0.0"
+          }
+        },
+        "json-stringify-safe": {
+          "version": "5.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "jsonify": {
+          "version": "0.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "jsprim": {
+          "version": "1.4.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "assert-plus": "1.0.0",
+            "extsprintf": "1.0.2",
+            "json-schema": "0.2.3",
+            "verror": "1.3.6"
+          },
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "mime-db": {
+          "version": "1.27.0",
+          "bundled": true,
+          "dev": true
+        },
+        "mime-types": {
+          "version": "2.1.15",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "mime-db": "1.27.0"
+          }
+        },
+        "minimatch": {
+          "version": "3.0.4",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "brace-expansion": "1.1.7"
+          }
+        },
+        "minimist": {
+          "version": "0.0.8",
+          "bundled": true,
+          "dev": true
+        },
+        "mkdirp": {
+          "version": "0.5.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "minimist": "0.0.8"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "node-pre-gyp": {
+          "version": "0.6.39",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "detect-libc": "1.0.2",
+            "hawk": "3.1.3",
+            "mkdirp": "0.5.1",
+            "nopt": "4.0.1",
+            "npmlog": "4.1.0",
+            "rc": "1.2.1",
+            "request": "2.81.0",
+            "rimraf": "2.6.1",
+            "semver": "5.3.0",
+            "tar": "2.2.1",
+            "tar-pack": "3.4.0"
+          }
+        },
+        "nopt": {
+          "version": "4.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "abbrev": "1.1.0",
+            "osenv": "0.1.4"
+          }
+        },
+        "npmlog": {
+          "version": "4.1.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "are-we-there-yet": "1.1.4",
+            "console-control-strings": "1.1.0",
+            "gauge": "2.7.4",
+            "set-blocking": "2.0.0"
+          }
+        },
+        "number-is-nan": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "oauth-sign": {
+          "version": "0.8.2",
+          "bundled": true,
+          "dev": true,
+          "optional": 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.0.2"
+          }
+        },
+        "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.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "os-homedir": "1.0.2",
+            "os-tmpdir": "1.0.2"
+          }
+        },
+        "path-is-absolute": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "performance-now": {
+          "version": "0.2.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "process-nextick-args": {
+          "version": "1.0.7",
+          "bundled": true,
+          "dev": true
+        },
+        "punycode": {
+          "version": "1.4.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "qs": {
+          "version": "6.4.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "rc": {
+          "version": "1.2.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "deep-extend": "0.4.2",
+            "ini": "1.3.4",
+            "minimist": "1.2.0",
+            "strip-json-comments": "2.0.1"
+          },
+          "dependencies": {
+            "minimist": {
+              "version": "1.2.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "readable-stream": {
+          "version": "2.2.9",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "buffer-shims": "1.0.0",
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "1.0.7",
+            "string_decoder": "1.0.1",
+            "util-deprecate": "1.0.2"
+          }
+        },
+        "request": {
+          "version": "2.81.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "aws-sign2": "0.6.0",
+            "aws4": "1.6.0",
+            "caseless": "0.12.0",
+            "combined-stream": "1.0.5",
+            "extend": "3.0.1",
+            "forever-agent": "0.6.1",
+            "form-data": "2.1.4",
+            "har-validator": "4.2.1",
+            "hawk": "3.1.3",
+            "http-signature": "1.1.1",
+            "is-typedarray": "1.0.0",
+            "isstream": "0.1.2",
+            "json-stringify-safe": "5.0.1",
+            "mime-types": "2.1.15",
+            "oauth-sign": "0.8.2",
+            "performance-now": "0.2.0",
+            "qs": "6.4.0",
+            "safe-buffer": "5.0.1",
+            "stringstream": "0.0.5",
+            "tough-cookie": "2.3.2",
+            "tunnel-agent": "0.6.0",
+            "uuid": "3.0.1"
+          }
+        },
+        "rimraf": {
+          "version": "2.6.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "glob": "7.1.2"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "semver": {
+          "version": "5.3.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
+        },
+        "sntp": {
+          "version": "1.0.9",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "hoek": "2.16.3"
+          }
+        },
+        "sshpk": {
+          "version": "1.13.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "asn1": "0.2.3",
+            "assert-plus": "1.0.0",
+            "bcrypt-pbkdf": "1.0.1",
+            "dashdash": "1.14.1",
+            "ecc-jsbn": "0.1.1",
+            "getpass": "0.1.7",
+            "jodid25519": "1.0.2",
+            "jsbn": "0.1.1",
+            "tweetnacl": "0.14.5"
+          },
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "string-width": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "code-point-at": "1.1.0",
+            "is-fullwidth-code-point": "1.0.0",
+            "strip-ansi": "3.0.1"
+          }
+        },
+        "string_decoder": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "safe-buffer": "5.0.1"
+          }
+        },
+        "stringstream": {
+          "version": "0.0.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "ansi-regex": "2.1.1"
+          }
+        },
+        "strip-json-comments": {
+          "version": "2.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "tar": {
+          "version": "2.2.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "block-stream": "0.0.9",
+            "fstream": "1.0.11",
+            "inherits": "2.0.3"
+          }
+        },
+        "tar-pack": {
+          "version": "3.4.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "debug": "2.6.8",
+            "fstream": "1.0.11",
+            "fstream-ignore": "1.0.5",
+            "once": "1.4.0",
+            "readable-stream": "2.2.9",
+            "rimraf": "2.6.1",
+            "tar": "2.2.1",
+            "uid-number": "0.0.6"
+          }
+        },
+        "tough-cookie": {
+          "version": "2.3.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "punycode": "1.4.1"
+          }
+        },
+        "tunnel-agent": {
+          "version": "0.6.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "safe-buffer": "5.0.1"
+          }
+        },
+        "tweetnacl": {
+          "version": "0.14.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "uid-number": {
+          "version": "0.0.6",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "util-deprecate": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        },
+        "uuid": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "verror": {
+          "version": "1.3.6",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "extsprintf": "1.0.2"
+          }
+        },
+        "wide-align": {
+          "version": "1.1.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "string-width": "1.0.2"
+          }
+        },
+        "wrappy": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        }
+      }
+    },
     "fstream": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",

From 66b95d65ccdb128e8d18219725e8a5c038affa88 Mon Sep 17 00:00:00 2001
From: RekkyRek <haslun16@edu.vilehlmina.se>
Date: Sun, 31 Dec 2017 15:21:54 +0100
Subject: [PATCH 04/63] Made settings more readable

---
 app/src/res/sass/modules/settings.sass | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/src/res/sass/modules/settings.sass b/app/src/res/sass/modules/settings.sass
index 60492d9b..01bd6b88 100644
--- a/app/src/res/sass/modules/settings.sass
+++ b/app/src/res/sass/modules/settings.sass
@@ -39,6 +39,9 @@
         color: white
       .multi_settings
         margin-bottom: 18px
+        background: #40415a
+        padding: 0.8rem
+        box-shadow: 2px 2px 5px rgba(0,0,0,0.2)
         .header
           color: white
           padding: 0.3rem 0
@@ -47,7 +50,9 @@
           margin-bottom: 0.6rem
           padding-left: 1rem
       .single_settings
-        padding-bottom: 0.6rem
+        background: #40415a
+        padding: 0.1rem 1rem 0.6rem 1rem
+        box-shadow: 2px 2px 5px rgba(0,0,0,0.2)
       .setting
         display: flex
         justify-content: space-between

From 2ee79572a7e021852dcaedf2bd713171163f3057 Mon Sep 17 00:00:00 2001
From: RekkyRek <haslun16@edu.vilehlmina.se>
Date: Sun, 31 Dec 2017 15:26:14 +0100
Subject: [PATCH 05/63] Modified searchbar to have more contrast and match
 colors.

---
 app/src/res/sass/modules/search.sass | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/src/res/sass/modules/search.sass b/app/src/res/sass/modules/search.sass
index 3f3f1048..be139ee2 100644
--- a/app/src/res/sass/modules/search.sass
+++ b/app/src/res/sass/modules/search.sass
@@ -33,3 +33,7 @@
     input
       font-size: 1.2rem
       padding: 0.2rem 0.2rem
+      &:focus
+        border-bottom: 0.12rem solid #C14857
+      &::-webkit-input-placeholder
+        color: #e6e6e6
\ No newline at end of file

From b34f0965472d2a3bc8cc80af83d3202dd5488f29 Mon Sep 17 00:00:00 2001
From: RekkyRek <haslun16@edu.vilehlmina.se>
Date: Sun, 31 Dec 2017 15:28:41 +0100
Subject: [PATCH 06/63] Fixed overflow bug

---
 app/src/res/sass/modules/comments.sass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/res/sass/modules/comments.sass b/app/src/res/sass/modules/comments.sass
index e8329bf8..e1b64a99 100644
--- a/app/src/res/sass/modules/comments.sass
+++ b/app/src/res/sass/modules/comments.sass
@@ -16,6 +16,7 @@
     flex: 2
 .comments_container
   overflow-y: scroll
+  overflow-x: hidden
   height: calc(100% - (#{$post_comment_height} + 1rem))
   h4
     text-align: center

From 69df5e32249ab2aff448ec02caa2a6267d0075b9 Mon Sep 17 00:00:00 2001
From: RekkyRek <haslun16@edu.vilehlmina.se>
Date: Sun, 31 Dec 2017 15:48:30 +0100
Subject: [PATCH 07/63] Added notif sort button

---
 app/src/js/components/notifs/notifs.js | 8 ++++++++
 app/src/res/sass/modules/notifs.sass   | 4 +++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/src/js/components/notifs/notifs.js b/app/src/js/components/notifs/notifs.js
index e161aa5e..eebb283d 100644
--- a/app/src/js/components/notifs/notifs.js
+++ b/app/src/js/components/notifs/notifs.js
@@ -12,6 +12,7 @@ class Notifs extends Component {
       notifTimestamp: 1,
       active: false,
       firstFetch: true,
+      sort: false,
     };
   }
   componentDidMount() {
@@ -61,6 +62,9 @@ class Notifs extends Component {
       this.setState({ active: !this.state.active });
     }
   }
+  toggleSort() {
+    this.setState({ sort: !this.state.sort });
+  }
   render() {
     const { notifs, auth, open, clearNotifs } = this.props;
 
@@ -98,6 +102,10 @@ class Notifs extends Component {
             className="notifs_clear"
             onClick={() => { clearNotifs(); }}
           >Clear All</button>
+          <button
+            className="notifs_clear notifs_sort"
+            onClick={() => { this.toggleSort(); }}
+          >{this.state.sort ? 'Sort by Quality' : 'Sort by Time'}</button>
           <NotifBubbles data={notifs} open={open} />
         </div>
         <div className={`notifs_bubbles_container ${this.state.active ? 'active' : ''}`} />
diff --git a/app/src/res/sass/modules/notifs.sass b/app/src/res/sass/modules/notifs.sass
index cf37e34a..92c95fb8 100644
--- a/app/src/res/sass/modules/notifs.sass
+++ b/app/src/res/sass/modules/notifs.sass
@@ -87,11 +87,13 @@
       animation: notif_bubbles_out 0.3s forwards
     .notifs_clear
       z-index: 299
-      width: 6.2rem
+      width: 9.5rem
       height: 2.3rem
       position: fixed
       top: 0px
       left: 15px
+    .notifs_sort
+      top: 48px
     .notif_bubble_container
       display: flex
       width: 100%

From 983f3a7dabcade579045fdc47c8fb7f1773dd0e0 Mon Sep 17 00:00:00 2001
From: RekkyRek <haslun16@edu.vilehlmina.se>
Date: Sun, 31 Dec 2017 16:58:58 +0100
Subject: [PATCH 08/63] Started work on notif sorting

---
 app/src/js/actions/notifs.js           | 12 ++++++++++++
 app/src/js/components/notifs/notifs.js |  6 ++++++
 2 files changed, 18 insertions(+)

diff --git a/app/src/js/actions/notifs.js b/app/src/js/actions/notifs.js
index 963972f2..9b8a6c89 100644
--- a/app/src/js/actions/notifs.js
+++ b/app/src/js/actions/notifs.js
@@ -10,6 +10,18 @@ const currentWindow = require('electron').remote.getCurrentWindow();
 let clearingNotifs = false;
 let fetching = false;
 
+/* function calculateQuality(a, b) {
+  let worth = {
+    comment_discuss: 0,
+    comment_vote: 1,
+    content_vote: 2,
+    comment_content: 3,
+    comment_mention: 4,
+  }
+
+  return worth[a] > worth[b];
+} */
+
 /**
  * Fetches notifications
  *
diff --git a/app/src/js/components/notifs/notifs.js b/app/src/js/components/notifs/notifs.js
index eebb283d..0a72fac1 100644
--- a/app/src/js/components/notifs/notifs.js
+++ b/app/src/js/components/notifs/notifs.js
@@ -23,6 +23,11 @@ class Notifs extends Component {
      */
     const { fetchNotifs } = this.props;
 
+    if (localStorage.getItem('notifsort') === null) { localStorage.setItem('notifsort', false); }
+
+    // eslint-disable-next-line
+    this.setState({ sort: localStorage.getItem('notifsort') }); 
+
     fetchNotifs();
 
     setInterval(() => {
@@ -64,6 +69,7 @@ class Notifs extends Component {
   }
   toggleSort() {
     this.setState({ sort: !this.state.sort });
+    localStorage.setItem('notifsort', this.state.sort);
   }
   render() {
     const { notifs, auth, open, clearNotifs } = this.props;

From 17abfd0913e72d8484f472fcc688e6a7d79b1b06 Mon Sep 17 00:00:00 2001
From: RekkyRek <haslun16@edu.vilehlmina.se>
Date: Sun, 31 Dec 2017 17:26:43 +0100
Subject: [PATCH 09/63] Almost working

---
 app/src/js/actions/notifs.js                  | 12 -------
 app/src/js/components/notifs/notif_bubbles.js | 33 +++++++++++++++++++
 app/src/js/components/notifs/notifs.js        |  4 +--
 3 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/app/src/js/actions/notifs.js b/app/src/js/actions/notifs.js
index 9b8a6c89..963972f2 100644
--- a/app/src/js/actions/notifs.js
+++ b/app/src/js/actions/notifs.js
@@ -10,18 +10,6 @@ const currentWindow = require('electron').remote.getCurrentWindow();
 let clearingNotifs = false;
 let fetching = false;
 
-/* function calculateQuality(a, b) {
-  let worth = {
-    comment_discuss: 0,
-    comment_vote: 1,
-    content_vote: 2,
-    comment_content: 3,
-    comment_mention: 4,
-  }
-
-  return worth[a] > worth[b];
-} */
-
 /**
  * Fetches notifications
  *
diff --git a/app/src/js/components/notifs/notif_bubbles.js b/app/src/js/components/notifs/notif_bubbles.js
index 347f9de5..6713abfc 100644
--- a/app/src/js/components/notifs/notif_bubbles.js
+++ b/app/src/js/components/notifs/notif_bubbles.js
@@ -5,9 +5,41 @@ import Notification from './notif_bubble';
 class NotifBubbles extends PureComponent {
   render() {
     const { data, open } = this.props;
+
+    console.log('render');
+
     if (!data) {
       return <div />;
     }
+
+    if (this.props.sort) {
+      console.time('qualitySort');
+      const worth = {
+        comment_discuss: 0,
+        comment_vote: 1,
+        content_vote: 2,
+        comment_content: 3,
+        comment_mention: 4,
+      };
+      const tempItems = data.items;
+      tempItems.sort((a, b) => {
+        if (a.read === 1) { return 1; }
+        console.log(a.type, worth[a.type] >= worth[b.type], worth[a.type], worth[b.type])
+        if (worth[a.type] >= worth[b.type]) { return -1; }
+        return -1;
+      });
+      data.items = tempItems;
+      console.timeEnd('qualitySort');
+    } else {
+      console.time('timeSort');
+      const tempItems = data.items;
+      tempItems.sort((a, b) => {
+        return b.created_time - a.created_time;
+      });
+      data.items = tempItems;
+      console.timeEnd('timeSort'); 
+    }
+
     return (
       <div className="notif_bubble_container">
         {
@@ -29,6 +61,7 @@ class NotifBubbles extends PureComponent {
 
 NotifBubbles.propTypes = {
   data: PropTypes.object.isRequired,
+  sort: PropTypes.object.isRequired,
   open: PropTypes.func.isRequired,
 };
 
diff --git a/app/src/js/components/notifs/notifs.js b/app/src/js/components/notifs/notifs.js
index 0a72fac1..0b9deb05 100644
--- a/app/src/js/components/notifs/notifs.js
+++ b/app/src/js/components/notifs/notifs.js
@@ -111,8 +111,8 @@ class Notifs extends Component {
           <button
             className="notifs_clear notifs_sort"
             onClick={() => { this.toggleSort(); }}
-          >{this.state.sort ? 'Sort by Quality' : 'Sort by Time'}</button>
-          <NotifBubbles data={notifs} open={open} />
+          >{this.state.sort ? 'Sort by Time' : 'Sort by Quality'}</button>
+          <NotifBubbles data={notifs} open={open} sort={this.state.sort} />
         </div>
         <div className={`notifs_bubbles_container ${this.state.active ? 'active' : ''}`} />
       </div>

From 55f500ea2e881c7e0a6aee1d81dfa2d94444ecca Mon Sep 17 00:00:00 2001
From: Tahnik Mustasin <tahnik@live.co.uk>
Date: Tue, 2 Jan 2018 00:46:30 +0600
Subject: [PATCH 10/63] Made sure the small icons are also shown on mouse enter

---
 app/src/js/components/item/bottom_bar.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/js/components/item/bottom_bar.js b/app/src/js/components/item/bottom_bar.js
index 787be7f9..efa10c2b 100644
--- a/app/src/js/components/item/bottom_bar.js
+++ b/app/src/js/components/item/bottom_bar.js
@@ -118,6 +118,7 @@ class BottomBar extends Component {
             <div
               className={`trigger ${this.state.triggerActive ? 'active' : ''}`}
               onClick={() => this.setState({ triggerActive: true })}
+              onMouseEnter={() => this.setState({ triggerActive: true })}
             >
               <p><i className="ion-android-more-horizontal" /></p>
             </div>

From 37f82c9c00a291de1e4931bcbdbfa2ce204669a7 Mon Sep 17 00:00:00 2001
From: Tahnik Mustasin <tahnik@live.co.uk>
Date: Tue, 2 Jan 2018 00:54:44 +0600
Subject: [PATCH 11/63] Removed custom from the nav :(

---
 app/src/js/containers/navigation/sidenav.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/js/containers/navigation/sidenav.js b/app/src/js/containers/navigation/sidenav.js
index 61bb56a4..8b0d6be6 100644
--- a/app/src/js/containers/navigation/sidenav.js
+++ b/app/src/js/containers/navigation/sidenav.js
@@ -13,7 +13,7 @@ const SIDE_NAV_ITEMS = [
   { name: 'Collabs', route: ROUTES.collabs, icon: 'ion-person-stalker' },
   { name: 'Stories', route: ROUTES.stories, icon: 'ion-ios-bookmarks' },
   { name: 'Weekly', route: ROUTES.weekly, icon: 'ion-android-calendar' },
-  { name: 'Custom', route: ROUTES.custom, icon: 'ion-edit' },
+  // { name: 'Custom', route: ROUTES.custom, icon: 'ion-edit' },
   { name: 'Search', route: ROUTES.search, icon: 'ion-android-search' },
   { name: 'Settings', route: ROUTES.settings, icon: 'ion-gear-a' },
 ];

From 17dd828cda46e6f6ee18a0110757a7cf845b523a Mon Sep 17 00:00:00 2001
From: Tahnik Mustasin <tahnik@live.co.uk>
Date: Tue, 2 Jan 2018 00:57:18 +0600
Subject: [PATCH 12/63] Removed subscribe button

---
 app/src/js/components/item/bottom_bar.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/js/components/item/bottom_bar.js b/app/src/js/components/item/bottom_bar.js
index efa10c2b..33bfbfdc 100644
--- a/app/src/js/components/item/bottom_bar.js
+++ b/app/src/js/components/item/bottom_bar.js
@@ -135,7 +135,7 @@ class BottomBar extends Component {
                 </div>
                 : null
               }
-              {
+              {/* {
                 !this.props.isUser ?
                   <div
                     className={`toggle_item subscribe ${subscribed ? 'active' : null}`}
@@ -144,7 +144,7 @@ class BottomBar extends Component {
                     <p><i className="ion-social-rss-outline" /></p>
                   </div>
                   : null
-              }
+              } */}
               { !item.rant_id && !item.c_type ?
                 <div
                   className={`toggle_item favorite ${favorited ? 'active' : null}`}

From afdabfd0dac293e6a9afdcd68365d57c9e364f06 Mon Sep 17 00:00:00 2001
From: Tahnik Mustasin <tahnik@live.co.uk>
Date: Tue, 2 Jan 2018 01:16:58 +0600
Subject: [PATCH 13/63] Settings is now saved correctly

---
 app/src/js/components/settings/settings.js | 4 ++++
 app/src/js/containers/settings/settings.js | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/src/js/components/settings/settings.js b/app/src/js/components/settings/settings.js
index 7a421248..e098aaf5 100644
--- a/app/src/js/components/settings/settings.js
+++ b/app/src/js/components/settings/settings.js
@@ -15,6 +15,9 @@ class Items extends Component {
       activeNav: SETTINGS_NAV[0],
     };
   }
+  componentDidUpdate() {
+    this.props.saveUserState();
+  }
   getSettings() {
     const { activeNav } = this.state;
     const { settings, changeGeneral, theme } = this.props;
@@ -52,6 +55,7 @@ class Items extends Component {
 Items.propTypes = {
   settings: PropTypes.object.isRequired,
   changeGeneral: PropTypes.func.isRequired,
+  saveUserState: PropTypes.func.isRequired,
   theme: PropTypes.object.isRequired,
 };
 
diff --git a/app/src/js/containers/settings/settings.js b/app/src/js/containers/settings/settings.js
index 22d775c2..183ee1f4 100644
--- a/app/src/js/containers/settings/settings.js
+++ b/app/src/js/containers/settings/settings.js
@@ -1,12 +1,15 @@
 import { connect } from 'react-redux';
 import Settings from '../../components/settings/settings';
-import { changeGeneral } from '../../actions/settings';
+import { changeGeneral, saveUserState } from '../../actions/settings';
 
 
 const mapDispatchToProps = dispatch => ({
   changeGeneral: (primarykey, secondaryKey, value) => {
     dispatch(changeGeneral(primarykey, secondaryKey, value));
   },
+  saveUserState: () => {
+    dispatch(saveUserState());
+  },
 });
 
 const mapStateToProps = state => ({

From 1e5a74ce779b3ee2f9a6485f91f9fc64664a5d36 Mon Sep 17 00:00:00 2001
From: Tahnik Mustasin <tahnik@live.co.uk>
Date: Tue, 2 Jan 2018 02:34:32 +0600
Subject: [PATCH 14/63] Custom theme working pretty well. Just need to all the
 bits

---
 app/src/js/components/settings/theme.js |   66 +-
 app/src/js/consts/types.js              |   40 +
 app/src/js/reducers/settings.js         |    2 +-
 app/src/res/sass/modules/settings.sass  |   16 +-
 package-lock.json                       | 1377 +++++++++++++++++++----
 package.json                            |    1 +
 6 files changed, 1276 insertions(+), 226 deletions(-)

diff --git a/app/src/js/components/settings/theme.js b/app/src/js/components/settings/theme.js
index eb43cf30..a29d0d8e 100644
--- a/app/src/js/components/settings/theme.js
+++ b/app/src/js/components/settings/theme.js
@@ -1,10 +1,35 @@
 import React, { Component } from 'react';
+import { SketchPicker, CompactPicker, SliderPicker } from 'react-color';
 import PropTypes from 'prop-types';
 import Twemoji from 'react-twemoji';
-import { timeSince } from '../../consts/utils';
 import { THEMES } from '../../consts/types';
 
 class Theme extends Component {
+  constructor() {
+    super();
+    this.state = {
+      theme: {
+        name: 'Custom Theme',
+        id: 'custom_theme',
+        backgroundColor: '#54556E',
+        item_card: {
+          backgroundColor: '#40415A',
+          color: 'white',
+        },
+        comment_card: {
+          backgroundColor: '#40415A',
+          color: 'white',
+        },
+        column: {
+          backgroundColor: '#54556E',
+          width: '450',
+        },
+        user_badge: {
+          details_back: '#54556E',
+        },
+      },
+    };
+  }
   getTheme(key) {
     const { theme } = this.props;
     const selectedTheme = THEMES[key];
@@ -28,10 +53,6 @@ class Theme extends Component {
               width: `${selectedTheme.column.width}px`,
             }}
         >
-          <span
-            className="timesince"
-          >{timeSince(1514319457 * 1000)}
-          </span>
           <div
             className="body_container"
             onClick={() => this.open()}
@@ -43,9 +64,7 @@ class Theme extends Component {
                 <span
                   className="body"
                 >
-                  Bro ipsum dolor sit amet sucker hole heli granny gear, newschooler McTwist cruiser wheelie drop taco mitt. Bomb hole Skate avie carve grind line. Bro clipless table top whip glades pow pow poaching avie wack. 180 wheelie corduroy table top schwag shred.
-                  Chillax flow pow pow steeps granny gear. Crank grind rigid sketching. Manny hero stomp bowl rock roll, pinner granny gear dust on crust reverse camber hardtail. Clean air avie euro death cookies, face shots japan air brain bucket sketching presta.
-                  Death cookies first tracks ski bum T-bar 360. Wheelie deck afterbang rail table top gapers. Whistler nose dust on crust stoked pipe endo. Heli pow rock roll, schwag sketching gaper noodle road rash laps free ride gnar gnar frozen chicken heads rigid avie.
+                  Select Me Please!
                 </span>
               </Twemoji>
             </div>
@@ -57,14 +76,43 @@ class Theme extends Component {
   getThemes() {
     return Object.keys(THEMES).map(key => this.getTheme(key));
   }
+  changeTheme() {
+    this.props.changeTheme(null, this.state.theme);
+  }
   render() {
+    const { theme } = this.state;
     return (
       <div className="theme_container">
         <div className="items_container">
           { this.getThemes() }
         </div>
         <div className="custom_theme">
-          <h4>Global</h4>
+          <div className="theme_settings">
+            <h4>Global</h4>
+          </div>
+          <div className="theme_settings">
+            <h4>Custom</h4>
+            <div className="custom_colors">
+              <div className="custom_color background_color">
+                <span className="color_type">Background Color</span>
+                <SliderPicker
+                  color={theme.backgroundColor}
+                  onChangeComplete={(color) => {
+                    this.setState({ theme: { ...theme, backgroundColor: color.hex } });
+                    this.changeTheme();
+                  }}
+                />
+                <input
+                  onChange={(e) => {
+                    this.setState({ theme: { ...theme, backgroundColor: e.target.value } });
+                    this.changeTheme();
+                  }}
+                  value={theme.backgroundColor}
+                />
+              </div>
+
+            </div>
+          </div>
         </div>
       </div>
     );
diff --git a/app/src/js/consts/types.js b/app/src/js/consts/types.js
index 4e382188..b2980fcf 100644
--- a/app/src/js/consts/types.js
+++ b/app/src/js/consts/types.js
@@ -86,6 +86,46 @@ export const THEMES = {
       details_back: '#54556E',
     },
   },
+  SOLARIZED_DARK: {
+    name: 'Solarized Dark',
+    id: 'solarized_dark',
+    backgroundColor: '#342345',
+    item_card: {
+      backgroundColor: '#40415A',
+      color: 'white',
+    },
+    comment_card: {
+      backgroundColor: '#40415A',
+      color: 'white',
+    },
+    column: {
+      backgroundColor: '#54556E',
+      width: '450',
+    },
+    user_badge: {
+      details_back: '#54556E',
+    },
+  },
+  SOLARIZED_LIGHT: {
+    name: 'Solarized Light',
+    id: 'solarized_light',
+    backgroundColor: '#230923',
+    item_card: {
+      backgroundColor: '#40415A',
+      color: 'white',
+    },
+    comment_card: {
+      backgroundColor: '#40415A',
+      color: 'white',
+    },
+    column: {
+      backgroundColor: '#54556E',
+      width: '450',
+    },
+    user_badge: {
+      details_back: '#54556E',
+    },
+  },
 };
 
 export const STATE = {
diff --git a/app/src/js/reducers/settings.js b/app/src/js/reducers/settings.js
index 3f9985a5..1c84235f 100644
--- a/app/src/js/reducers/settings.js
+++ b/app/src/js/reducers/settings.js
@@ -23,7 +23,7 @@ export default (state = DEFAULT_STATES.settings, action) => {
     case SETTINGS.ACTION.CHANGE_THEME: {
       const { key, values } = action;
       let theme = { ...state.general };
-      theme = THEMES[key];
+      theme = values || THEMES[key];
       return {
         ...state,
         theme,
diff --git a/app/src/res/sass/modules/settings.sass b/app/src/res/sass/modules/settings.sass
index da1db2f3..d1c820df 100644
--- a/app/src/res/sass/modules/settings.sass
+++ b/app/src/res/sass/modules/settings.sass
@@ -31,15 +31,27 @@
       display: flex
       margin-top: 2rem
       position: relative
+      flex-direction: column
       .custom_theme
         flex: 1
+        .theme_settings
+          .custom_colors
+            padding-left: 1rem
+            margin-left: 1.5rem
+            display: flex
+            .custom_color
+              flex: 0 0 25%
+              span
+                display: block
+                margin-bottom: 1rem
+              input
+                width: 98.5%
       .items_container
         flex: 1
         display: flex
-        flex-direction: column
         .item_container
           cursor: pointer
-          margin: 0.5rem 0
+          margin: 0.5rem
           padding: 1rem
           .item_card
             pointer-events: none
diff --git a/package-lock.json b/package-lock.json
index 9ae59b81..5d34c19e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4,6 +4,40 @@
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
+    "7zip": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/7zip/-/7zip-0.0.6.tgz",
+      "integrity": "sha1-nK+xca+CMpSQNTtIFvAzR6oVCjA="
+    },
+    "7zip-bin": {
+      "version": "2.3.4",
+      "resolved": "https://registry.npmjs.org/7zip-bin/-/7zip-bin-2.3.4.tgz",
+      "integrity": "sha512-s2ZfgRWXeNUQTQE3O85CDDrU2Uo90pMlMkTxkz85wQOuzVxB8t4cubMPup3WlTPFKHQgb6lDkAHS3ljkUSFO6A==",
+      "dev": true,
+      "requires": {
+        "7zip-bin-linux": "1.2.0",
+        "7zip-bin-mac": "1.0.1",
+        "7zip-bin-win": "2.1.1"
+      }
+    },
+    "7zip-bin-linux": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/7zip-bin-linux/-/7zip-bin-linux-1.2.0.tgz",
+      "integrity": "sha512-umB98LN18XBGKPw4EKET2zPDqVhEU1mxXA1Gx0BM+DoBt4hnlZPNkpSMNzmuNbQshi9SzLhqlTAyKcAgNrbV3Q==",
+      "optional": true
+    },
+    "7zip-bin-mac": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/7zip-bin-mac/-/7zip-bin-mac-1.0.1.tgz",
+      "integrity": "sha1-Pmh3i78JJq3GgVlCcHRQXUdVXAI=",
+      "optional": true
+    },
+    "7zip-bin-win": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/7zip-bin-win/-/7zip-bin-win-2.1.1.tgz",
+      "integrity": "sha512-6VGEW7PXGroTsoI2QW3b0ea95HJmbVBHvfANKLLMzSzFA1zKqVX5ybNuhmeGpf6vA0x8FJTt6twpprDANsY5WQ==",
+      "optional": true
+    },
     "@babel/code-frame": {
       "version": "7.0.0-beta.31",
       "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0-beta.31.tgz",
@@ -142,26 +176,6 @@
       "integrity": "sha512-h5u7FnEnG+Fn44HfknTTvu199FzFWVSo97ToSRWvXl1F11UfN6wGnE7exUy23pFfDn+CeluvEoCoe4l2eCVC3g==",
       "dev": true
     },
-    "7zip": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/7zip/-/7zip-0.0.6.tgz",
-      "integrity": "sha1-nK+xca+CMpSQNTtIFvAzR6oVCjA="
-    },
-    "7zip-bin": {
-      "version": "2.3.4",
-      "resolved": "https://registry.npmjs.org/7zip-bin/-/7zip-bin-2.3.4.tgz",
-      "integrity": "sha512-s2ZfgRWXeNUQTQE3O85CDDrU2Uo90pMlMkTxkz85wQOuzVxB8t4cubMPup3WlTPFKHQgb6lDkAHS3ljkUSFO6A==",
-      "dev": true,
-      "requires": {
-        "7zip-bin-win": "2.1.1"
-      }
-    },
-    "7zip-bin-win": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/7zip-bin-win/-/7zip-bin-win-2.1.1.tgz",
-      "integrity": "sha512-6VGEW7PXGroTsoI2QW3b0ea95HJmbVBHvfANKLLMzSzFA1zKqVX5ybNuhmeGpf6vA0x8FJTt6twpprDANsY5WQ==",
-      "optional": true
-    },
     "abbrev": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
@@ -2350,6 +2364,7 @@
       "requires": {
         "anymatch": "1.3.2",
         "async-each": "1.0.1",
+        "fsevents": "1.1.3",
         "glob-parent": "2.0.0",
         "inherits": "2.0.3",
         "is-binary-path": "1.0.1",
@@ -4855,200 +4870,1104 @@
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
           "dev": true
         },
-        "isobject": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-          "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+        "isobject": {
+          "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"
+          }
+        }
+      }
+    },
+    "finalhandler": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz",
+      "integrity": "sha1-zgtoVbRYU+eRsvzGgARtiCU91/U=",
+      "dev": true,
+      "requires": {
+        "debug": "2.6.9",
+        "encodeurl": "1.0.1",
+        "escape-html": "1.0.3",
+        "on-finished": "2.3.0",
+        "parseurl": "1.3.2",
+        "statuses": "1.3.1",
+        "unpipe": "1.0.0"
+      },
+      "dependencies": {
+        "debug": {
+          "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"
+          }
+        }
+      }
+    },
+    "find-cache-dir": {
+      "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.1.0",
+        "pkg-dir": "2.0.0"
+      }
+    },
+    "find-up": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+      "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+      "requires": {
+        "locate-path": "2.0.0"
+      }
+    },
+    "flat-cache": {
+      "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.3",
+        "del": "2.2.2",
+        "graceful-fs": "4.1.11",
+        "write": "0.2.1"
+      }
+    },
+    "flatten": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz",
+      "integrity": "sha1-2uRqnXj74lKSJYzB54CkHZXAN4I=",
+      "dev": true
+    },
+    "flush-write-stream": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.2.tgz",
+      "integrity": "sha1-yBuQ2HRnZvGmCaRoCZRsRd2K5Bc=",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.3"
+      }
+    },
+    "for-in": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
+      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
+      "dev": true
+    },
+    "for-own": {
+      "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.2"
+      }
+    },
+    "foreach": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
+      "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=",
+      "dev": true
+    },
+    "forever-agent": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
+      "dev": true
+    },
+    "form-data": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz",
+      "integrity": "sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8=",
+      "requires": {
+        "asynckit": "0.4.0",
+        "combined-stream": "1.0.5",
+        "mime-types": "2.1.17"
+      }
+    },
+    "forwarded": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
+      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=",
+      "dev": true
+    },
+    "fresh": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
+      "dev": true
+    },
+    "from": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz",
+      "integrity": "sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=",
+      "dev": true
+    },
+    "from2": {
+      "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.3",
+        "readable-stream": "2.3.3"
+      }
+    },
+    "front-matter": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/front-matter/-/front-matter-2.1.2.tgz",
+      "integrity": "sha1-91mDufL0E75ljJPf172M5AePXNs=",
+      "dev": true,
+      "requires": {
+        "js-yaml": "3.10.0"
+      }
+    },
+    "fs-extra": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz",
+      "integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==",
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "jsonfile": "4.0.0",
+        "universalify": "0.1.1"
+      }
+    },
+    "fs-extra-p": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/fs-extra-p/-/fs-extra-p-4.5.0.tgz",
+      "integrity": "sha512-V/sdZmV+Yx3+nfXmjRTdBP4mVWCt7hZ0+ZOv+IZo+6fdkBxafaGsI7mYeNv/J3rWyz+mIToCFQORFSwt1bZw8Q==",
+      "requires": {
+        "bluebird-lst": "1.0.5",
+        "fs-extra": "5.0.0"
+      }
+    },
+    "fs-write-stream-atomic": {
+      "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.11",
+        "iferr": "0.1.5",
+        "imurmurhash": "0.1.4",
+        "readable-stream": "2.3.3"
+      }
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
+    },
+    "fsevents": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.3.tgz",
+      "integrity": "sha512-WIr7iDkdmdbxu/Gh6eKEZJL6KPE74/5MEsf2whTOFNxbIoIixogroLdKYqB6FDav4Wavh/lZdzzd3b2KxIXC5Q==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "nan": "2.8.0",
+        "node-pre-gyp": "0.6.39"
+      },
+      "dependencies": {
+        "abbrev": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "ajv": {
+          "version": "4.11.8",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "co": "4.6.0",
+            "json-stable-stringify": "1.0.1"
+          }
+        },
+        "ansi-regex": {
+          "version": "2.1.1",
+          "bundled": true,
+          "dev": true
+        },
+        "aproba": {
+          "version": "1.1.1",
+          "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",
+            "readable-stream": "2.2.9"
+          }
+        },
+        "asn1": {
+          "version": "0.2.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "assert-plus": {
+          "version": "0.2.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "asynckit": {
+          "version": "0.4.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "aws-sign2": {
+          "version": "0.6.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "aws4": {
+          "version": "1.6.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "balanced-match": {
+          "version": "0.4.2",
+          "bundled": true,
+          "dev": true
+        },
+        "bcrypt-pbkdf": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "tweetnacl": "0.14.5"
+          }
+        },
+        "block-stream": {
+          "version": "0.0.9",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "inherits": "2.0.3"
+          }
+        },
+        "boom": {
+          "version": "2.10.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "hoek": "2.16.3"
+          }
+        },
+        "brace-expansion": {
+          "version": "1.1.7",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "balanced-match": "0.4.2",
+            "concat-map": "0.0.1"
+          }
+        },
+        "buffer-shims": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "caseless": {
+          "version": "0.12.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "co": {
+          "version": "4.6.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "code-point-at": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true
+        },
+        "combined-stream": {
+          "version": "1.0.5",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "delayed-stream": "1.0.0"
+          }
+        },
+        "concat-map": {
+          "version": "0.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "console-control-strings": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true
+        },
+        "core-util-is": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        },
+        "cryptiles": {
+          "version": "2.0.5",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "boom": "2.10.1"
+          }
+        },
+        "dashdash": {
+          "version": "1.14.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "assert-plus": "1.0.0"
+          },
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "debug": {
+          "version": "2.6.8",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "deep-extend": {
+          "version": "0.4.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "delayed-stream": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "delegates": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "detect-libc": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "ecc-jsbn": {
+          "version": "0.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "jsbn": "0.1.1"
+          }
+        },
+        "extend": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "extsprintf": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        },
+        "forever-agent": {
+          "version": "0.6.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "form-data": {
+          "version": "2.1.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "asynckit": "0.4.0",
+            "combined-stream": "1.0.5",
+            "mime-types": "2.1.15"
+          }
+        },
+        "fs.realpath": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "fstream": {
+          "version": "1.0.11",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "graceful-fs": "4.1.11",
+            "inherits": "2.0.3",
+            "mkdirp": "0.5.1",
+            "rimraf": "2.6.1"
+          }
+        },
+        "fstream-ignore": {
+          "version": "1.0.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "fstream": "1.0.11",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4"
+          }
+        },
+        "gauge": {
+          "version": "2.7.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "aproba": "1.1.1",
+            "console-control-strings": "1.1.0",
+            "has-unicode": "2.0.1",
+            "object-assign": "4.1.1",
+            "signal-exit": "3.0.2",
+            "string-width": "1.0.2",
+            "strip-ansi": "3.0.1",
+            "wide-align": "1.1.2"
+          }
+        },
+        "getpass": {
+          "version": "0.1.7",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "assert-plus": "1.0.0"
+          },
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "glob": {
+          "version": "7.1.2",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "fs.realpath": "1.0.0",
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
+          }
+        },
+        "graceful-fs": {
+          "version": "4.1.11",
+          "bundled": true,
+          "dev": true
+        },
+        "har-schema": {
+          "version": "1.0.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "har-validator": {
+          "version": "4.2.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ajv": "4.11.8",
+            "har-schema": "1.0.5"
+          }
+        },
+        "has-unicode": {
+          "version": "2.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "hawk": {
+          "version": "3.1.3",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "boom": "2.10.1",
+            "cryptiles": "2.0.5",
+            "hoek": "2.16.3",
+            "sntp": "1.0.9"
+          }
+        },
+        "hoek": {
+          "version": "2.16.3",
+          "bundled": true,
+          "dev": true
+        },
+        "http-signature": {
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "assert-plus": "0.2.0",
+            "jsprim": "1.4.0",
+            "sshpk": "1.13.0"
+          }
+        },
+        "inflight": {
+          "version": "1.0.6",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "once": "1.4.0",
+            "wrappy": "1.0.2"
+          }
+        },
+        "inherits": {
+          "version": "2.0.3",
+          "bundled": true,
+          "dev": true
+        },
+        "ini": {
+          "version": "1.3.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "number-is-nan": "1.0.1"
+          }
+        },
+        "is-typedarray": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "isarray": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "isstream": {
+          "version": "0.1.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "jodid25519": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "jsbn": "0.1.1"
+          }
+        },
+        "jsbn": {
+          "version": "0.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "json-schema": {
+          "version": "0.2.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "json-stable-stringify": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "jsonify": "0.0.0"
+          }
+        },
+        "json-stringify-safe": {
+          "version": "5.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "jsonify": {
+          "version": "0.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "jsprim": {
+          "version": "1.4.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "assert-plus": "1.0.0",
+            "extsprintf": "1.0.2",
+            "json-schema": "0.2.3",
+            "verror": "1.3.6"
+          },
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "mime-db": {
+          "version": "1.27.0",
+          "bundled": true,
+          "dev": true
+        },
+        "mime-types": {
+          "version": "2.1.15",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "mime-db": "1.27.0"
+          }
+        },
+        "minimatch": {
+          "version": "3.0.4",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "brace-expansion": "1.1.7"
+          }
+        },
+        "minimist": {
+          "version": "0.0.8",
+          "bundled": true,
+          "dev": true
+        },
+        "mkdirp": {
+          "version": "0.5.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "minimist": "0.0.8"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "node-pre-gyp": {
+          "version": "0.6.39",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "detect-libc": "1.0.2",
+            "hawk": "3.1.3",
+            "mkdirp": "0.5.1",
+            "nopt": "4.0.1",
+            "npmlog": "4.1.0",
+            "rc": "1.2.1",
+            "request": "2.81.0",
+            "rimraf": "2.6.1",
+            "semver": "5.3.0",
+            "tar": "2.2.1",
+            "tar-pack": "3.4.0"
+          }
+        },
+        "nopt": {
+          "version": "4.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "abbrev": "1.1.0",
+            "osenv": "0.1.4"
+          }
+        },
+        "npmlog": {
+          "version": "4.1.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "are-we-there-yet": "1.1.4",
+            "console-control-strings": "1.1.0",
+            "gauge": "2.7.4",
+            "set-blocking": "2.0.0"
+          }
+        },
+        "number-is-nan": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "oauth-sign": {
+          "version": "0.8.2",
+          "bundled": true,
+          "dev": true,
+          "optional": 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.0.2"
+          }
+        },
+        "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.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "os-homedir": "1.0.2",
+            "os-tmpdir": "1.0.2"
+          }
+        },
+        "path-is-absolute": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "performance-now": {
+          "version": "0.2.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "process-nextick-args": {
+          "version": "1.0.7",
+          "bundled": true,
+          "dev": true
+        },
+        "punycode": {
+          "version": "1.4.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "qs": {
+          "version": "6.4.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "rc": {
+          "version": "1.2.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "deep-extend": "0.4.2",
+            "ini": "1.3.4",
+            "minimist": "1.2.0",
+            "strip-json-comments": "2.0.1"
+          },
+          "dependencies": {
+            "minimist": {
+              "version": "1.2.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "readable-stream": {
+          "version": "2.2.9",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "buffer-shims": "1.0.0",
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "1.0.7",
+            "string_decoder": "1.0.1",
+            "util-deprecate": "1.0.2"
+          }
+        },
+        "request": {
+          "version": "2.81.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "aws-sign2": "0.6.0",
+            "aws4": "1.6.0",
+            "caseless": "0.12.0",
+            "combined-stream": "1.0.5",
+            "extend": "3.0.1",
+            "forever-agent": "0.6.1",
+            "form-data": "2.1.4",
+            "har-validator": "4.2.1",
+            "hawk": "3.1.3",
+            "http-signature": "1.1.1",
+            "is-typedarray": "1.0.0",
+            "isstream": "0.1.2",
+            "json-stringify-safe": "5.0.1",
+            "mime-types": "2.1.15",
+            "oauth-sign": "0.8.2",
+            "performance-now": "0.2.0",
+            "qs": "6.4.0",
+            "safe-buffer": "5.0.1",
+            "stringstream": "0.0.5",
+            "tough-cookie": "2.3.2",
+            "tunnel-agent": "0.6.0",
+            "uuid": "3.0.1"
+          }
+        },
+        "rimraf": {
+          "version": "2.6.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "glob": "7.1.2"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "semver": {
+          "version": "5.3.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
+        },
+        "sntp": {
+          "version": "1.0.9",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "hoek": "2.16.3"
+          }
+        },
+        "sshpk": {
+          "version": "1.13.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "asn1": "0.2.3",
+            "assert-plus": "1.0.0",
+            "bcrypt-pbkdf": "1.0.1",
+            "dashdash": "1.14.1",
+            "ecc-jsbn": "0.1.1",
+            "getpass": "0.1.7",
+            "jodid25519": "1.0.2",
+            "jsbn": "0.1.1",
+            "tweetnacl": "0.14.5"
+          },
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "string-width": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "code-point-at": "1.1.0",
+            "is-fullwidth-code-point": "1.0.0",
+            "strip-ansi": "3.0.1"
+          }
+        },
+        "string_decoder": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "safe-buffer": "5.0.1"
+          }
+        },
+        "stringstream": {
+          "version": "0.0.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "ansi-regex": "2.1.1"
+          }
+        },
+        "strip-json-comments": {
+          "version": "2.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "tar": {
+          "version": "2.2.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "block-stream": "0.0.9",
+            "fstream": "1.0.11",
+            "inherits": "2.0.3"
+          }
+        },
+        "tar-pack": {
+          "version": "3.4.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "debug": "2.6.8",
+            "fstream": "1.0.11",
+            "fstream-ignore": "1.0.5",
+            "once": "1.4.0",
+            "readable-stream": "2.2.9",
+            "rimraf": "2.6.1",
+            "tar": "2.2.1",
+            "uid-number": "0.0.6"
+          }
+        },
+        "tough-cookie": {
+          "version": "2.3.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "punycode": "1.4.1"
+          }
+        },
+        "tunnel-agent": {
+          "version": "0.6.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "safe-buffer": "5.0.1"
+          }
+        },
+        "tweetnacl": {
+          "version": "0.14.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "uid-number": {
+          "version": "0.0.6",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "util-deprecate": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        },
+        "uuid": {
+          "version": "3.0.1",
+          "bundled": true,
           "dev": true,
+          "optional": true
+        },
+        "verror": {
+          "version": "1.3.6",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
           "requires": {
-            "isarray": "1.0.0"
+            "extsprintf": "1.0.2"
           }
-        }
-      }
-    },
-    "finalhandler": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz",
-      "integrity": "sha1-zgtoVbRYU+eRsvzGgARtiCU91/U=",
-      "dev": true,
-      "requires": {
-        "debug": "2.6.9",
-        "encodeurl": "1.0.1",
-        "escape-html": "1.0.3",
-        "on-finished": "2.3.0",
-        "parseurl": "1.3.2",
-        "statuses": "1.3.1",
-        "unpipe": "1.0.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+        },
+        "wide-align": {
+          "version": "1.1.2",
+          "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
-            "ms": "2.0.0"
+            "string-width": "1.0.2"
           }
+        },
+        "wrappy": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
         }
       }
     },
-    "find-cache-dir": {
-      "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.1.0",
-        "pkg-dir": "2.0.0"
-      }
-    },
-    "find-up": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-      "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-      "requires": {
-        "locate-path": "2.0.0"
-      }
-    },
-    "flat-cache": {
-      "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.3",
-        "del": "2.2.2",
-        "graceful-fs": "4.1.11",
-        "write": "0.2.1"
-      }
-    },
-    "flatten": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz",
-      "integrity": "sha1-2uRqnXj74lKSJYzB54CkHZXAN4I=",
-      "dev": true
-    },
-    "flush-write-stream": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.2.tgz",
-      "integrity": "sha1-yBuQ2HRnZvGmCaRoCZRsRd2K5Bc=",
-      "dev": true,
-      "requires": {
-        "inherits": "2.0.3",
-        "readable-stream": "2.3.3"
-      }
-    },
-    "for-in": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
-      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
-      "dev": true
-    },
-    "for-own": {
-      "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.2"
-      }
-    },
-    "foreach": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
-      "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=",
-      "dev": true
-    },
-    "forever-agent": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
-      "dev": true
-    },
-    "form-data": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz",
-      "integrity": "sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8=",
-      "requires": {
-        "asynckit": "0.4.0",
-        "combined-stream": "1.0.5",
-        "mime-types": "2.1.17"
-      }
-    },
-    "forwarded": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
-      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=",
-      "dev": true
-    },
-    "fresh": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
-      "dev": true
-    },
-    "from": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz",
-      "integrity": "sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=",
-      "dev": true
-    },
-    "from2": {
-      "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.3",
-        "readable-stream": "2.3.3"
-      }
-    },
-    "front-matter": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/front-matter/-/front-matter-2.1.2.tgz",
-      "integrity": "sha1-91mDufL0E75ljJPf172M5AePXNs=",
-      "dev": true,
-      "requires": {
-        "js-yaml": "3.10.0"
-      }
-    },
-    "fs-extra": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz",
-      "integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==",
-      "requires": {
-        "graceful-fs": "4.1.11",
-        "jsonfile": "4.0.0",
-        "universalify": "0.1.1"
-      }
-    },
-    "fs-extra-p": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/fs-extra-p/-/fs-extra-p-4.5.0.tgz",
-      "integrity": "sha512-V/sdZmV+Yx3+nfXmjRTdBP4mVWCt7hZ0+ZOv+IZo+6fdkBxafaGsI7mYeNv/J3rWyz+mIToCFQORFSwt1bZw8Q==",
-      "requires": {
-        "bluebird-lst": "1.0.5",
-        "fs-extra": "5.0.0"
-      }
-    },
-    "fs-write-stream-atomic": {
-      "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.11",
-        "iferr": "0.1.5",
-        "imurmurhash": "0.1.4",
-        "readable-stream": "2.3.3"
-      }
-    },
-    "fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
-    },
     "fstream": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
@@ -6684,6 +7603,11 @@
       "integrity": "sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ=",
       "dev": true
     },
+    "material-colors": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/material-colors/-/material-colors-1.2.5.tgz",
+      "integrity": "sha1-UpJZPmdUyxvMK5gDDk4Najr8nqE="
+    },
     "math-expression-evaluator": {
       "version": "1.2.17",
       "resolved": "https://registry.npmjs.org/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz",
@@ -8903,6 +9827,18 @@
         "prop-types": "15.6.0"
       }
     },
+    "react-color": {
+      "version": "2.13.8",
+      "resolved": "https://registry.npmjs.org/react-color/-/react-color-2.13.8.tgz",
+      "integrity": "sha1-vMWPeaciub/DfEAuaM0Y8mlwruQ=",
+      "requires": {
+        "lodash": "4.17.4",
+        "material-colors": "1.2.5",
+        "prop-types": "15.6.0",
+        "reactcss": "1.2.3",
+        "tinycolor2": "1.4.1"
+      }
+    },
     "react-deep-force-update": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/react-deep-force-update/-/react-deep-force-update-2.1.1.tgz",
@@ -9004,6 +9940,14 @@
         "twemoji": "2.5.0"
       }
     },
+    "reactcss": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/reactcss/-/reactcss-1.2.3.tgz",
+      "integrity": "sha512-KiwVUcFu1RErkI97ywr8nvx8dNOpT03rbnma0SSalTYjkrPYaEajR4a/MRt6DZ46K6arDRbWMNHF+xH7G7n/8A==",
+      "requires": {
+        "lodash": "4.17.4"
+      }
+    },
     "read-config-file": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/read-config-file/-/read-config-file-1.2.1.tgz",
@@ -10553,15 +11497,6 @@
       "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
       "dev": true
     },
-    "string_decoder": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "5.1.1"
-      }
-    },
     "string-width": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
@@ -10602,6 +11537,15 @@
         "function-bind": "1.1.1"
       }
     },
+    "string_decoder": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "5.1.1"
+      }
+    },
     "stringstream": {
       "version": "0.0.5",
       "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
@@ -10882,6 +11826,11 @@
         "setimmediate": "1.0.5"
       }
     },
+    "tinycolor2": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.4.1.tgz",
+      "integrity": "sha1-9PrTM0R7wLB9TcjpIJ2POaisd+g="
+    },
     "tmp": {
       "version": "0.0.33",
       "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
diff --git a/package.json b/package.json
index 3f65b2a3..8e45794d 100644
--- a/package.json
+++ b/package.json
@@ -125,6 +125,7 @@
     "prop-types": "^15.6.0",
     "rantscript": "^1.4.0",
     "react": "^16.2.0",
+    "react-color": "^2.13.8",
     "react-dom": "^16.2.0",
     "react-redux": "^5.0.6",
     "react-router": "^4.2.0",

From dcc7d8014be53d422ab0189b15134a7b5dbb6ddf Mon Sep 17 00:00:00 2001
From: Tahnik Mustasin <tahnik@live.co.uk>
Date: Tue, 2 Jan 2018 02:57:57 +0600
Subject: [PATCH 15/63] Color picker for some parts is working, the sidenav and
 bottom bar will follow the theme

---
 app/src/js/components/item/bottom_bar.js    | 10 ++-
 app/src/js/components/item/item_card.js     |  3 +-
 app/src/js/components/navigation/items.js   |  9 ++-
 app/src/js/components/navigation/sidenav.js |  9 ++-
 app/src/js/components/settings/theme.js     | 78 +++++++++++++++++++++
 app/src/js/containers/navigation/sidenav.js |  2 +-
 app/src/res/sass/modules/settings.sass      |  6 +-
 7 files changed, 106 insertions(+), 11 deletions(-)

diff --git a/app/src/js/components/item/bottom_bar.js b/app/src/js/components/item/bottom_bar.js
index 781633c0..0cb3a350 100644
--- a/app/src/js/components/item/bottom_bar.js
+++ b/app/src/js/components/item/bottom_bar.js
@@ -84,11 +84,16 @@ class BottomBar extends Component {
     return <div />;
   }
   render() {
-    const { type, item, onDelete } = this.props;
+    const {
+      type, item, onDelete, theme,
+    } = this.props;
     const { favorited, subscribed } = this.state;
     const disabled = this.props.isUser ? 'disabled' : '';
     return (
-      <div className="bottom_bar_container" >
+      <div
+        className="bottom_bar_container"
+        style={{ backgroundColor: theme.item_card.backgroundColor }}
+      >
         <div className="left_items">
           <div
             className={`upvote ${disabled} ${this.state.isVoted > 0 ? 'upvoted' : ''}`}
@@ -203,6 +208,7 @@ BottomBar.propTypes = {
   onCommentsClick: PropTypes.func,
   copyToClip: PropTypes.func.isRequired,
   item: PropTypes.object.isRequired,
+  theme: PropTypes.object.isRequired,
   onFavorite: PropTypes.func.isRequired,
   onSubscribe: PropTypes.func.isRequired,
 };
diff --git a/app/src/js/components/item/item_card.js b/app/src/js/components/item/item_card.js
index c2e972d2..2ecb6cec 100644
--- a/app/src/js/components/item/item_card.js
+++ b/app/src/js/components/item/item_card.js
@@ -172,7 +172,7 @@ class ItemCard extends Component {
             >{object}
             </span>
           ))}
-        </div>}
+                                   </div>}
       </div>
     );
   }
@@ -306,6 +306,7 @@ class ItemCard extends Component {
         </div>
         {this.getTags()}
         <BottomBar
+          theme={theme}
           item={item}
           vote={vote}
           isUser={isUser}
diff --git a/app/src/js/components/navigation/items.js b/app/src/js/components/navigation/items.js
index 5eb290fc..0b198e1a 100644
--- a/app/src/js/components/navigation/items.js
+++ b/app/src/js/components/navigation/items.js
@@ -2,15 +2,20 @@ import React from 'react';
 import PropTypes from 'prop-types';
 
 const Items = ({
-  item, onClick, className, active,
+  item, onClick, className, active, theme,
 }) => (
-  <div className={`item ${className} ${active}`} onClick={() => onClick()} >
+  <div
+    className={`item ${className} ${active}`}
+    onClick={() => onClick()}
+    style={{ backgroundColor: theme.item_card.backgroundColor }}
+  >
     <i className={item.icon} />{ item.name }
   </div>
 );
 
 Items.propTypes = {
   item: PropTypes.object.isRequired,
+  theme: PropTypes.object.isRequired,
   onClick: PropTypes.func.isRequired,
   className: PropTypes.string,
   active: PropTypes.string,
diff --git a/app/src/js/components/navigation/sidenav.js b/app/src/js/components/navigation/sidenav.js
index 3fa598da..b102be98 100644
--- a/app/src/js/components/navigation/sidenav.js
+++ b/app/src/js/components/navigation/sidenav.js
@@ -36,10 +36,13 @@ class SideNav extends Component {
   }
   render() {
     const {
-      sideNavItems, history, location, resetColumn, open, settings,
+      sideNavItems, history, location, resetColumn, open, settings, theme,
     } = this.props;
     return (
-      <div className="sidenav_container" >
+      <div
+        className="sidenav_container"
+        style={{ backgroundColor: theme.item_card.backgroundColor }}
+      >
         <div className="navs">
           <div className="devRant_logo">
             { this.getUserCard() }
@@ -47,6 +50,7 @@ class SideNav extends Component {
           {
             sideNavItems.map(item => (
               <Item
+                {...this.props}
                 key={item.route}
                 item={item}
                 active={location.pathname === item.route ? 'active' : null}
@@ -90,6 +94,7 @@ SideNav.propTypes = {
   login: PropTypes.func.isRequired,
   logout: PropTypes.func.isRequired,
   location: PropTypes.object.isRequired,
+  theme: PropTypes.object.isRequired,
   fetchUser: PropTypes.func.isRequired,
   resetColumn: PropTypes.func.isRequired,
   open: PropTypes.func.isRequired,
diff --git a/app/src/js/components/settings/theme.js b/app/src/js/components/settings/theme.js
index a29d0d8e..da8ed84e 100644
--- a/app/src/js/components/settings/theme.js
+++ b/app/src/js/components/settings/theme.js
@@ -110,6 +110,84 @@ class Theme extends Component {
                   value={theme.backgroundColor}
                 />
               </div>
+              <div className="custom_color rant_color">
+                <span className="color_type">Rant Card Background Color</span>
+                <SliderPicker
+                  color={theme.item_card.backgroundColor}
+                  onChangeComplete={(color) => {
+                    this.setState({
+                      theme: {
+                        ...theme,
+                        item_card: { ...theme.item_card, backgroundColor: color.hex },
+                      },
+                    });
+                    this.changeTheme();
+                  }}
+                />
+                <input
+                  onChange={(e) => {
+                    this.setState({
+                      theme: {
+                        ...theme,
+                        item_card: { ...theme.item_card, backgroundColor: e.target.value },
+                      },
+                    });
+                    this.changeTheme();
+                  }}
+                  value={theme.item_card.backgroundColor}
+                />
+              </div>
+              <div className="custom_color background_color">
+                <span className="color_type">Rant Card Text Color</span>
+                <SliderPicker
+                  color={theme.backgroundColor}
+                  onChangeComplete={(color) => {
+                    this.setState({ theme: { ...theme, backgroundColor: color.hex } });
+                    this.changeTheme();
+                  }}
+                />
+                <input
+                  onChange={(e) => {
+                    this.setState({ theme: { ...theme, backgroundColor: e.target.value } });
+                    this.changeTheme();
+                  }}
+                  value={theme.backgroundColor}
+                />
+              </div>
+              <div className="custom_color background_color">
+                <span className="color_type">Background Color</span>
+                <SliderPicker
+                  color={theme.backgroundColor}
+                  onChangeComplete={(color) => {
+                    this.setState({ theme: { ...theme, backgroundColor: color.hex } });
+                    this.changeTheme();
+                  }}
+                />
+                <input
+                  onChange={(e) => {
+                    this.setState({ theme: { ...theme, backgroundColor: e.target.value } });
+                    this.changeTheme();
+                  }}
+                  value={theme.backgroundColor}
+                />
+              </div>
+              <div className="custom_color background_color">
+                <span className="color_type">Background Color</span>
+                <SliderPicker
+                  color={theme.backgroundColor}
+                  onChangeComplete={(color) => {
+                    this.setState({ theme: { ...theme, backgroundColor: color.hex } });
+                    this.changeTheme();
+                  }}
+                />
+                <input
+                  onChange={(e) => {
+                    this.setState({ theme: { ...theme, backgroundColor: e.target.value } });
+                    this.changeTheme();
+                  }}
+                  value={theme.backgroundColor}
+                />
+              </div>
 
             </div>
           </div>
diff --git a/app/src/js/containers/navigation/sidenav.js b/app/src/js/containers/navigation/sidenav.js
index 61bb56a4..2edf2532 100644
--- a/app/src/js/containers/navigation/sidenav.js
+++ b/app/src/js/containers/navigation/sidenav.js
@@ -37,7 +37,7 @@ const mapDispatchToProps = dispatch => ({
 });
 
 const mapStateToProps = state => ({
-  theme: state.theme,
+  theme: state.settings.theme,
   auth: state.auth,
   user: state.user,
   sideNavItems: SIDE_NAV_ITEMS,
diff --git a/app/src/res/sass/modules/settings.sass b/app/src/res/sass/modules/settings.sass
index d1c820df..e24b98b0 100644
--- a/app/src/res/sass/modules/settings.sass
+++ b/app/src/res/sass/modules/settings.sass
@@ -36,11 +36,11 @@
         flex: 1
         .theme_settings
           .custom_colors
-            padding-left: 1rem
-            margin-left: 1.5rem
             display: flex
+            flex-wrap: wrap
             .custom_color
-              flex: 0 0 25%
+              margin: 0.5rem
+              flex: 1 0 20%
               span
                 display: block
                 margin-bottom: 1rem

From aa411704599847b284bebcc1c2e25df34efd1ad4 Mon Sep 17 00:00:00 2001
From: RekkyRek <haslun16@edu.vilehlmina.se>
Date: Mon, 1 Jan 2018 22:15:18 +0100
Subject: [PATCH 16/63] Made presets show names

---
 app/src/js/components/settings/theme.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/js/components/settings/theme.js b/app/src/js/components/settings/theme.js
index da8ed84e..aba828a5 100644
--- a/app/src/js/components/settings/theme.js
+++ b/app/src/js/components/settings/theme.js
@@ -64,7 +64,7 @@ class Theme extends Component {
                 <span
                   className="body"
                 >
-                  Select Me Please!
+                  {selectedTheme.name}
                 </span>
               </Twemoji>
             </div>

From 8a94578f1fffb57da0c3ff7fdbac04d551c91424 Mon Sep 17 00:00:00 2001
From: RekkyRek <haslun16@edu.vilehlmina.se>
Date: Mon, 1 Jan 2018 22:15:48 +0100
Subject: [PATCH 17/63] Added shadow to preset cards to stand out from
 background

---
 app/src/res/sass/modules/settings.sass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/res/sass/modules/settings.sass b/app/src/res/sass/modules/settings.sass
index e24b98b0..57dac235 100644
--- a/app/src/res/sass/modules/settings.sass
+++ b/app/src/res/sass/modules/settings.sass
@@ -53,6 +53,7 @@
           cursor: pointer
           margin: 0.5rem
           padding: 1rem
+          box-shadow: 1px 1px 6px rgba(0,0,0,0.33)          
           .item_card
             pointer-events: none
             margin: 0

From 7a67a4a750abe433bd1b81e174a02eb7f08546d2 Mon Sep 17 00:00:00 2001
From: RekkyRek <haslun16@edu.vilehlmina.se>
Date: Mon, 1 Jan 2018 22:32:00 +0100
Subject: [PATCH 18/63] Added background color to the settings card to match
 changes in dec31

---
 app/src/js/components/settings/theme.js | 3 ++-
 app/src/res/sass/modules/settings.sass  | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/js/components/settings/theme.js b/app/src/js/components/settings/theme.js
index aba828a5..46d5dca8 100644
--- a/app/src/js/components/settings/theme.js
+++ b/app/src/js/components/settings/theme.js
@@ -81,8 +81,9 @@ class Theme extends Component {
   }
   render() {
     const { theme } = this.state;
+    console.log(theme)
     return (
-      <div className="theme_container">
+      <div className="theme_container" style={{ backgroundColor: theme.item_card.backgroundColor }}>
         <div className="items_container">
           { this.getThemes() }
         </div>
diff --git a/app/src/res/sass/modules/settings.sass b/app/src/res/sass/modules/settings.sass
index 57dac235..359fa994 100644
--- a/app/src/res/sass/modules/settings.sass
+++ b/app/src/res/sass/modules/settings.sass
@@ -28,6 +28,7 @@
     overflow-y: scroll
     .theme_container
       color: white
+      padding: 0.8rem
       display: flex
       margin-top: 2rem
       position: relative

From 0d59d479cfc92b1d4159a33807f951545579fe09 Mon Sep 17 00:00:00 2001
From: RekkyRek <haslun16@edu.vilehlmina.se>
Date: Mon, 1 Jan 2018 22:40:37 +0100
Subject: [PATCH 19/63] Added sharable theme string (WIP) and changed input
 focus color.

---
 app/src/js/components/settings/theme.js | 7 +++++++
 app/src/res/sass/modules/settings.sass  | 6 ++++++
 2 files changed, 13 insertions(+)

diff --git a/app/src/js/components/settings/theme.js b/app/src/js/components/settings/theme.js
index 46d5dca8..563f64fc 100644
--- a/app/src/js/components/settings/theme.js
+++ b/app/src/js/components/settings/theme.js
@@ -189,8 +189,15 @@ class Theme extends Component {
                   value={theme.backgroundColor}
                 />
               </div>
+            </div>
 
+            <div className="sharable_string">
+              <span className="sharable_title">Sharable theme string</span>
+              <input
+                value={`${theme.backgroundColor},${theme.item_card.backgroundColor},${theme.item_card.color} xd meme`}
+              />
             </div>
+
           </div>
         </div>
       </div>
diff --git a/app/src/res/sass/modules/settings.sass b/app/src/res/sass/modules/settings.sass
index 359fa994..2d770589 100644
--- a/app/src/res/sass/modules/settings.sass
+++ b/app/src/res/sass/modules/settings.sass
@@ -35,7 +35,13 @@
       flex-direction: column
       .custom_theme
         flex: 1
+        input:focus
+          border-bottom: 0.12rem solid #c14857
         .theme_settings
+          .sharable_string
+            padding: 0.5rem
+            input
+              width: 98.5%
           .custom_colors
             display: flex
             flex-wrap: wrap

From da7c11ff2155750e776a6480e84e992df58a3df2 Mon Sep 17 00:00:00 2001
From: RekkyRek <haslun16@edu.vilehlmina.se>
Date: Mon, 1 Jan 2018 22:47:16 +0100
Subject: [PATCH 20/63] Changed sharable theme placeholder

---
 app/src/js/components/settings/theme.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/js/components/settings/theme.js b/app/src/js/components/settings/theme.js
index 563f64fc..9644e028 100644
--- a/app/src/js/components/settings/theme.js
+++ b/app/src/js/components/settings/theme.js
@@ -194,7 +194,7 @@ class Theme extends Component {
             <div className="sharable_string">
               <span className="sharable_title">Sharable theme string</span>
               <input
-                value={`${theme.backgroundColor},${theme.item_card.backgroundColor},${theme.item_card.color} xd meme`}
+                value={`${theme.backgroundColor},${theme.item_card.backgroundColor},${theme.item_card.color} <- should look like this. Also, paste here to apply theme`}
               />
             </div>
 

From 20b319ca7f13d90bbd1668636e1933b30dfa7a97 Mon Sep 17 00:00:00 2001
From: RekkyRek <haslun16@edu.vilehlmina.se>
Date: Mon, 1 Jan 2018 23:05:20 +0100
Subject: [PATCH 21/63] notif sort working now! (a bit slow, can be optimized)

---
 app/src/js/components/notifs/notif_bubbles.js | 40 ++++++++++++-------
 1 file changed, 26 insertions(+), 14 deletions(-)

diff --git a/app/src/js/components/notifs/notif_bubbles.js b/app/src/js/components/notifs/notif_bubbles.js
index 6713abfc..44efc2b2 100644
--- a/app/src/js/components/notifs/notif_bubbles.js
+++ b/app/src/js/components/notifs/notif_bubbles.js
@@ -14,21 +14,33 @@ class NotifBubbles extends PureComponent {
 
     if (this.props.sort) {
       console.time('qualitySort');
-      const worth = {
-        comment_discuss: 0,
-        comment_vote: 1,
-        content_vote: 2,
-        comment_content: 3,
-        comment_mention: 4,
-      };
+
       const tempItems = data.items;
-      tempItems.sort((a, b) => {
-        if (a.read === 1) { return 1; }
-        console.log(a.type, worth[a.type] >= worth[b.type], worth[a.type], worth[b.type])
-        if (worth[a.type] >= worth[b.type]) { return -1; }
-        return -1;
+      const commentDiscuss = [];
+      const commentVote = [];
+      const contentVote = [];
+      const commentContent = [];
+      const commentMention = [];
+      const alreadyRead = [];
+
+      tempItems.forEach((notif) => {
+        if (notif.read === 1) { alreadyRead.push(notif); return; }
+        if (notif.type === 'comment_discuss') { commentDiscuss.push(notif); }
+        if (notif.type === 'comment_vote') { commentVote.push(notif); }
+        if (notif.type === 'content_vote') { contentVote.push(notif); }
+        if (notif.type === 'comment_content') { commentContent.push(notif); }
+        if (notif.type === 'comment_mention') { commentMention.push(notif); }
       });
-      data.items = tempItems;
+
+      data.items = [
+        ...commentMention,
+        ...commentContent,
+        ...contentVote,
+        ...commentVote,
+        ...commentDiscuss,
+        ...alreadyRead,
+      ];
+
       console.timeEnd('qualitySort');
     } else {
       console.time('timeSort');
@@ -37,7 +49,7 @@ class NotifBubbles extends PureComponent {
         return b.created_time - a.created_time;
       });
       data.items = tempItems;
-      console.timeEnd('timeSort'); 
+      console.timeEnd('timeSort');
     }
 
     return (

From 9d6627f0d6bb19e70a76f2d08b128da4769f6e2e Mon Sep 17 00:00:00 2001
From: Tahnik Mustasin <tahnik@live.co.uk>
Date: Tue, 2 Jan 2018 22:47:22 +0600
Subject: [PATCH 22/63] Theme is pretty much working

---
 app/src/js/components/item/bottom_bar.js    |   6 +-
 app/src/js/components/item/item_card.js     |  10 +-
 app/src/js/components/navigation/sidenav.js |   6 +-
 app/src/js/components/notifs/notifs.js      |   8 +-
 app/src/js/components/settings/theme.js     | 161 +++++++++++++++++---
 app/src/js/components/user/user_badge.js    |   6 +-
 app/src/js/consts/types.js                  |  28 +++-
 app/src/js/containers/notifs/notifs.js      |   1 +
 app/src/res/sass/modules/settings.sass      |   7 +-
 9 files changed, 188 insertions(+), 45 deletions(-)

diff --git a/app/src/js/components/item/bottom_bar.js b/app/src/js/components/item/bottom_bar.js
index 0cb3a350..9da9f229 100644
--- a/app/src/js/components/item/bottom_bar.js
+++ b/app/src/js/components/item/bottom_bar.js
@@ -89,10 +89,14 @@ class BottomBar extends Component {
     } = this.props;
     const { favorited, subscribed } = this.state;
     const disabled = this.props.isUser ? 'disabled' : '';
+    const backgroundColor = type === ITEM.COMMENT.NAME ?
+      theme.comment_card.backgroundColor : theme.item_card.backgroundColor;
+    const color = type === ITEM.COMMENT.NAME ?
+      theme.comment_card.color : theme.item_card.color;
     return (
       <div
         className="bottom_bar_container"
-        style={{ backgroundColor: theme.item_card.backgroundColor }}
+        style={{ backgroundColor, color }}
       >
         <div className="left_items">
           <div
diff --git a/app/src/js/components/item/item_card.js b/app/src/js/components/item/item_card.js
index 2ecb6cec..b9150262 100644
--- a/app/src/js/components/item/item_card.js
+++ b/app/src/js/components/item/item_card.js
@@ -172,7 +172,7 @@ class ItemCard extends Component {
             >{object}
             </span>
           ))}
-                                   </div>}
+        </div>}
       </div>
     );
   }
@@ -260,13 +260,17 @@ class ItemCard extends Component {
     }
     // If there is any image with this rant
     const image = item.attached_image || '';
+    const backgroundColor = isComment ?
+      theme.comment_card.backgroundColor : theme.item_card.backgroundColor;
+    const color = isComment ?
+      theme.comment_card.color : theme.item_card.color;
     return (
       <div
         className={`item_card ${modal || isComment ? null : 'shadow'}`}
         id={item.id}
         style={{
-          backgroundColor: theme.item_card.backgroundColor,
-          color: theme.item_card.color,
+          backgroundColor,
+          color,
           width: `${theme.column.width}px`,
         }}
       >
diff --git a/app/src/js/components/navigation/sidenav.js b/app/src/js/components/navigation/sidenav.js
index b102be98..9b4361f0 100644
--- a/app/src/js/components/navigation/sidenav.js
+++ b/app/src/js/components/navigation/sidenav.js
@@ -77,7 +77,11 @@ class SideNav extends Component {
           }
         </div>
         <div className="add_rant">
-          <button onClick={() => open()} className="add_button">
+          <button
+            onClick={() => open()}
+            className="add_button"
+            style={{ backgroundColor: theme.plus_notif.backgroundColor }}
+          >
             <i className="ion-plus-round" />
           </button>
         </div>
diff --git a/app/src/js/components/notifs/notifs.js b/app/src/js/components/notifs/notifs.js
index 0cd3ee7b..d825fcba 100644
--- a/app/src/js/components/notifs/notifs.js
+++ b/app/src/js/components/notifs/notifs.js
@@ -63,7 +63,7 @@ class Notifs extends Component {
   }
   render() {
     const {
-      notifs, auth, open, clearNotifs,
+      notifs, auth, open, clearNotifs, theme,
     } = this.props;
 
     /* Wondering why there is notifs.notifs?
@@ -88,10 +88,13 @@ class Notifs extends Component {
       >
         <button
           className="notifs_ball"
+          style={{ backgroundColor: theme.plus_notif.backgroundColor }}
           onClick={() => { this.setState({ active: !this.state.active }); }}
         >
           <i className="ion-ios-bell" />
-          <span className={`num_unread ${notifs.num_unread > 0 ? 'unread' : ''}`} >
+          <span
+            className={`num_unread ${notifs.num_unread > 0 ? 'unread' : ''}`}
+          >
             { notifs ? notifs.num_unread : '' }
           </span>
         </button>
@@ -111,6 +114,7 @@ class Notifs extends Component {
 
 Notifs.propTypes = {
   auth: PropTypes.object.isRequired,
+  theme: PropTypes.object.isRequired,
   fetchNotifs: PropTypes.func.isRequired,
   notifs: PropTypes.object,
   openNotif: PropTypes.func.isRequired,
diff --git a/app/src/js/components/settings/theme.js b/app/src/js/components/settings/theme.js
index 9644e028..ba753b54 100644
--- a/app/src/js/components/settings/theme.js
+++ b/app/src/js/components/settings/theme.js
@@ -8,17 +8,18 @@ class Theme extends Component {
   constructor() {
     super();
     this.state = {
+      sharableTheme: '',
       theme: {
         name: 'Custom Theme',
         id: 'custom_theme',
         backgroundColor: '#54556E',
         item_card: {
           backgroundColor: '#40415A',
-          color: 'white',
+          color: '#FFFFFF',
         },
         comment_card: {
           backgroundColor: '#40415A',
-          color: 'white',
+          color: '#FFFFFF',
         },
         column: {
           backgroundColor: '#54556E',
@@ -27,9 +28,61 @@ class Theme extends Component {
         user_badge: {
           details_back: '#54556E',
         },
+        plus_notif: {
+          backgroundColor: '#D55161',
+        },
       },
     };
   }
+  componentWillMount() {
+    const { theme } = this.props;
+    const sharableTheme = `${theme.backgroundColor}, ${theme.item_card.backgroundColor}, ${theme.item_card.color}, ${theme.comment_card.backgroundColor}, ${theme.comment_card.color}, ${theme.plus_notif.backgroundColor}`;
+    this.setState({ theme, sharableTheme });
+  }
+  componentDidUpdate(prevProps) {
+    if (prevProps.theme !== this.props.theme) {
+      const { theme } = this.props;
+      const sharableTheme = `${theme.backgroundColor}, ${theme.item_card.backgroundColor}, ${theme.item_card.color}, ${theme.comment_card.backgroundColor}, ${theme.comment_card.color}, ${theme.plus_notif.backgroundColor}`;
+      this.setState({ sharableTheme, theme: this.props.theme });
+    }
+  }
+  handleSharableTheme(values) {
+    this.setState({ sharableTheme: values });
+    const themeVals = values.replace(' ', '').split(',');
+    if (themeVals.length !== 6) {
+      return;
+    }
+    for (let i = 0; i < themeVals.length; i += 1) {
+      const isCorrect = /[#]\S{6}/g.test(themeVals[i]);
+      if (!isCorrect) {
+        return;
+      }
+    }
+    console.log(themeVals);
+    this.props.changeTheme(null, {
+      name: 'Custom Theme',
+      id: 'custom_theme',
+      backgroundColor: themeVals[0].replace(' ', ''),
+      item_card: {
+        backgroundColor: themeVals[1].replace(' ', ''),
+        color: themeVals[2].replace(' ', ''),
+      },
+      comment_card: {
+        backgroundColor: themeVals[3].replace(' ', ''),
+        color: themeVals[4].replace(' ', ''),
+      },
+      column: {
+        backgroundColor: '#54556E',
+        width: '450',
+      },
+      user_badge: {
+        details_back: '#54556E',
+      },
+      plus_notif: {
+        backgroundColor: themeVals[5].replace(' ', ''),
+      },
+    });
+  }
   getTheme(key) {
     const { theme } = this.props;
     const selectedTheme = THEMES[key];
@@ -43,6 +96,7 @@ class Theme extends Component {
           backgroundColor: selectedTheme.backgroundColor,
         }}
         onClick={() => { this.props.changeTheme(key); }}
+        key={key}
       >
         <div
           className={`item_card ${1 ? null : 'shadow'}`}
@@ -81,7 +135,6 @@ class Theme extends Component {
   }
   render() {
     const { theme } = this.state;
-    console.log(theme)
     return (
       <div className="theme_container" style={{ backgroundColor: theme.item_card.backgroundColor }}>
         <div className="items_container">
@@ -94,8 +147,8 @@ class Theme extends Component {
           <div className="theme_settings">
             <h4>Custom</h4>
             <div className="custom_colors">
-              <div className="custom_color background_color">
-                <span className="color_type">Background Color</span>
+              <div className="custom_color">
+                <span className="color_type">Background</span>
                 <SliderPicker
                   color={theme.backgroundColor}
                   onChangeComplete={(color) => {
@@ -111,8 +164,8 @@ class Theme extends Component {
                   value={theme.backgroundColor}
                 />
               </div>
-              <div className="custom_color rant_color">
-                <span className="color_type">Rant Card Background Color</span>
+              <div className="custom_color">
+                <span className="color_type">Rant Card Background</span>
                 <SliderPicker
                   color={theme.item_card.backgroundColor}
                   onChangeComplete={(color) => {
@@ -138,55 +191,112 @@ class Theme extends Component {
                   value={theme.item_card.backgroundColor}
                 />
               </div>
-              <div className="custom_color background_color">
-                <span className="color_type">Rant Card Text Color</span>
+              <div className="custom_color">
+                <span className="color_type">Rant Card Text</span>
                 <SliderPicker
-                  color={theme.backgroundColor}
+                  color={theme.item_card.color}
                   onChangeComplete={(color) => {
-                    this.setState({ theme: { ...theme, backgroundColor: color.hex } });
+                    this.setState({
+                      theme: {
+                        ...theme,
+                        item_card: { ...theme.item_card, color: color.hex },
+                      },
+                    });
                     this.changeTheme();
                   }}
                 />
                 <input
                   onChange={(e) => {
-                    this.setState({ theme: { ...theme, backgroundColor: e.target.value } });
+                    this.setState({
+                      theme: {
+                        ...theme,
+                        item_card: { ...theme.item_card, color: e.target.value },
+                      },
+                    });
                     this.changeTheme();
                   }}
-                  value={theme.backgroundColor}
+                  value={theme.item_card.color}
                 />
               </div>
-              <div className="custom_color background_color">
-                <span className="color_type">Background Color</span>
+              <div className="custom_color">
+                <span className="color_type">Comment Card Background</span>
                 <SliderPicker
-                  color={theme.backgroundColor}
+                  color={theme.comment_card.backgroundColor}
                   onChangeComplete={(color) => {
-                    this.setState({ theme: { ...theme, backgroundColor: color.hex } });
+                    this.setState({
+                      theme: {
+                        ...theme,
+                        comment_card: { ...theme.comment_card, backgroundColor: color.hex },
+                      },
+                    });
                     this.changeTheme();
                   }}
                 />
                 <input
                   onChange={(e) => {
-                    this.setState({ theme: { ...theme, backgroundColor: e.target.value } });
+                    this.setState({
+                      theme: {
+                        ...theme,
+                        comment_card: { ...theme.comment_card, backgroundColor: e.target.value },
+                      },
+                    });
                     this.changeTheme();
                   }}
-                  value={theme.backgroundColor}
+                  value={theme.comment_card.backgroundColor}
+                />
+              </div>
+              <div className="custom_color">
+                <span className="color_type">Comment Card Text</span>
+                <SliderPicker
+                  color={theme.comment_card.color}
+                  onChangeComplete={(color) => {
+                    this.setState({
+                      theme: {
+                        ...theme,
+                        comment_card: { ...theme.comment_card, color: color.hex },
+                      },
+                    });
+                    this.changeTheme();
+                  }}
+                />
+                <input
+                  onChange={(e) => {
+                    this.setState({
+                      theme: {
+                        ...theme,
+                        comment_card: { ...theme.comment_card, color: e.target.value },
+                      },
+                    });
+                    this.changeTheme();
+                  }}
+                  value={theme.comment_card.color}
                 />
               </div>
               <div className="custom_color background_color">
-                <span className="color_type">Background Color</span>
+                <span className="color_type">PlusPlus and Notifs</span>
                 <SliderPicker
-                  color={theme.backgroundColor}
+                  color={theme.plus_notif.backgroundColor}
                   onChangeComplete={(color) => {
-                    this.setState({ theme: { ...theme, backgroundColor: color.hex } });
+                    this.setState({
+                      theme: {
+                        ...theme,
+                        plus_notif: { ...theme.plus_notif, backgroundColor: color.hex },
+                      },
+                    });
                     this.changeTheme();
                   }}
                 />
                 <input
                   onChange={(e) => {
-                    this.setState({ theme: { ...theme, backgroundColor: e.target.value } });
+                    this.setState({
+                      theme: {
+                        ...theme,
+                        plus_notif: { ...theme.plus_notif, backgroundColor: e.target.value },
+                      },
+                    });
                     this.changeTheme();
                   }}
-                  value={theme.backgroundColor}
+                  value={theme.plus_notif.backgroundColor}
                 />
               </div>
             </div>
@@ -194,7 +304,8 @@ class Theme extends Component {
             <div className="sharable_string">
               <span className="sharable_title">Sharable theme string</span>
               <input
-                value={`${theme.backgroundColor},${theme.item_card.backgroundColor},${theme.item_card.color} <- should look like this. Also, paste here to apply theme`}
+                onChange={e => this.handleSharableTheme(e.target.value)}
+                value={this.state.sharableTheme}
               />
             </div>
 
diff --git a/app/src/js/components/user/user_badge.js b/app/src/js/components/user/user_badge.js
index 64e1f7cb..53ba169c 100644
--- a/app/src/js/components/user/user_badge.js
+++ b/app/src/js/components/user/user_badge.js
@@ -40,17 +40,17 @@ class UserBadge extends Component {
             open={open}
           /> : null}
         <div className="details" onClick={() => this.openCard()}>
-          <p style={{ color: c }}>{user.username}</p>
+          <p>{user.username}</p>
           <span
             className="score"
-            style={{ backgroundColor: theme.user_badge.details_back }}
+            style={{ backgroundColor: theme.backgroundColor }}
           >{user.score}
           </span>
           {user.dpp === 1 && <span
             className="score"
             style={{ background: `#${user.avatar.b}` }}
           ><span>Supporter</span>
-          </span>}
+                             </span>}
         </div>
       </div>
     );
diff --git a/app/src/js/consts/types.js b/app/src/js/consts/types.js
index b2980fcf..1b044502 100644
--- a/app/src/js/consts/types.js
+++ b/app/src/js/consts/types.js
@@ -52,11 +52,11 @@ export const THEMES = {
     backgroundColor: '#54556E',
     item_card: {
       backgroundColor: '#40415A',
-      color: 'white',
+      color: '#FFFFFF',
     },
     comment_card: {
       backgroundColor: '#40415A',
-      color: 'white',
+      color: '#FFFFFF',
     },
     column: {
       backgroundColor: '#54556E',
@@ -65,6 +65,9 @@ export const THEMES = {
     user_badge: {
       details_back: '#54556E',
     },
+    plus_notif: {
+      backgroundColor: '#D55161',
+    },
   },
   LIGHT_THEME: {
     name: 'Light Theme',
@@ -72,11 +75,11 @@ export const THEMES = {
     backgroundColor: '#94556E',
     item_card: {
       backgroundColor: '#40415A',
-      color: 'white',
+      color: '#FFFFFF',
     },
     comment_card: {
       backgroundColor: '#40415A',
-      color: 'white',
+      color: '#FFFFFF',
     },
     column: {
       backgroundColor: '#54556E',
@@ -85,6 +88,9 @@ export const THEMES = {
     user_badge: {
       details_back: '#54556E',
     },
+    plus_notif: {
+      backgroundColor: '#D55161',
+    },
   },
   SOLARIZED_DARK: {
     name: 'Solarized Dark',
@@ -92,11 +98,11 @@ export const THEMES = {
     backgroundColor: '#342345',
     item_card: {
       backgroundColor: '#40415A',
-      color: 'white',
+      color: '#FFFFFF',
     },
     comment_card: {
       backgroundColor: '#40415A',
-      color: 'white',
+      color: '#FFFFFF',
     },
     column: {
       backgroundColor: '#54556E',
@@ -105,6 +111,9 @@ export const THEMES = {
     user_badge: {
       details_back: '#54556E',
     },
+    plus_notif: {
+      backgroundColor: '#D55161',
+    },
   },
   SOLARIZED_LIGHT: {
     name: 'Solarized Light',
@@ -112,11 +121,11 @@ export const THEMES = {
     backgroundColor: '#230923',
     item_card: {
       backgroundColor: '#40415A',
-      color: 'white',
+      color: '#FFFFFF',
     },
     comment_card: {
       backgroundColor: '#40415A',
-      color: 'white',
+      color: '#FFFFFF',
     },
     column: {
       backgroundColor: '#54556E',
@@ -125,6 +134,9 @@ export const THEMES = {
     user_badge: {
       details_back: '#54556E',
     },
+    plus_notif: {
+      backgroundColor: '#D55161',
+    },
   },
 };
 
diff --git a/app/src/js/containers/notifs/notifs.js b/app/src/js/containers/notifs/notifs.js
index fea0ce79..156aad03 100644
--- a/app/src/js/containers/notifs/notifs.js
+++ b/app/src/js/containers/notifs/notifs.js
@@ -10,6 +10,7 @@ import { ITEM } from '../../consts/types';
 const mapStateToProps = state => ({
   auth: state.auth,
   notifs: state.notifs,
+  theme: state.settings.theme,
 });
 
 /* Here we use dispatch to dispatch actions to redux store
diff --git a/app/src/res/sass/modules/settings.sass b/app/src/res/sass/modules/settings.sass
index 2d770589..4ce82933 100644
--- a/app/src/res/sass/modules/settings.sass
+++ b/app/src/res/sass/modules/settings.sass
@@ -47,7 +47,7 @@
             flex-wrap: wrap
             .custom_color
               margin: 0.5rem
-              flex: 1 0 20%
+              flex: 1 0 30%
               span
                 display: block
                 margin-bottom: 1rem
@@ -56,11 +56,14 @@
       .items_container
         flex: 1
         display: flex
+        flex-wrap: wrap
+        justify-content: center
         .item_container
+          flex: 0 0 25%
           cursor: pointer
           margin: 0.5rem
           padding: 1rem
-          box-shadow: 1px 1px 6px rgba(0,0,0,0.33)          
+          box-shadow: 1px 1px 6px rgba(0,0,0,0.33)
           .item_card
             pointer-events: none
             margin: 0

From 127283fac1b9127e689f6bb6fcdbdfd9be85b504 Mon Sep 17 00:00:00 2001
From: Tahnik Mustasin <tahnik@live.co.uk>
Date: Tue, 2 Jan 2018 22:53:39 +0600
Subject: [PATCH 23/63] fixed a bug for new states

---
 app/src/js/components/navigation/sidenav.js | 2 +-
 app/src/js/components/notifs/notifs.js      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/js/components/navigation/sidenav.js b/app/src/js/components/navigation/sidenav.js
index 9b4361f0..8e5b4ef0 100644
--- a/app/src/js/components/navigation/sidenav.js
+++ b/app/src/js/components/navigation/sidenav.js
@@ -80,7 +80,7 @@ class SideNav extends Component {
           <button
             onClick={() => open()}
             className="add_button"
-            style={{ backgroundColor: theme.plus_notif.backgroundColor }}
+            style={{ backgroundColor: theme.plus_notif ? theme.plus_notif.backgroundColor : '#D55161' }}
           >
             <i className="ion-plus-round" />
           </button>
diff --git a/app/src/js/components/notifs/notifs.js b/app/src/js/components/notifs/notifs.js
index d825fcba..fa087bbe 100644
--- a/app/src/js/components/notifs/notifs.js
+++ b/app/src/js/components/notifs/notifs.js
@@ -88,7 +88,7 @@ class Notifs extends Component {
       >
         <button
           className="notifs_ball"
-          style={{ backgroundColor: theme.plus_notif.backgroundColor }}
+          style={{ backgroundColor: theme.plus_notif ? theme.plus_notif.backgroundColor : '#D55161' }}
           onClick={() => { this.setState({ active: !this.state.active }); }}
         >
           <i className="ion-ios-bell" />

From dd0404f444b374f698e5425312287e4c08fe67f2 Mon Sep 17 00:00:00 2001
From: Tahnik Mustasin <tahnik@live.co.uk>
Date: Tue, 2 Jan 2018 23:07:17 +0600
Subject: [PATCH 24/63] Removed notif sort

---
 app/src/js/components/notifs/notif_bubbles.js | 43 -------------------
 1 file changed, 43 deletions(-)

diff --git a/app/src/js/components/notifs/notif_bubbles.js b/app/src/js/components/notifs/notif_bubbles.js
index 44efc2b2..c0887ebb 100644
--- a/app/src/js/components/notifs/notif_bubbles.js
+++ b/app/src/js/components/notifs/notif_bubbles.js
@@ -6,52 +6,10 @@ class NotifBubbles extends PureComponent {
   render() {
     const { data, open } = this.props;
 
-    console.log('render');
-
     if (!data) {
       return <div />;
     }
 
-    if (this.props.sort) {
-      console.time('qualitySort');
-
-      const tempItems = data.items;
-      const commentDiscuss = [];
-      const commentVote = [];
-      const contentVote = [];
-      const commentContent = [];
-      const commentMention = [];
-      const alreadyRead = [];
-
-      tempItems.forEach((notif) => {
-        if (notif.read === 1) { alreadyRead.push(notif); return; }
-        if (notif.type === 'comment_discuss') { commentDiscuss.push(notif); }
-        if (notif.type === 'comment_vote') { commentVote.push(notif); }
-        if (notif.type === 'content_vote') { contentVote.push(notif); }
-        if (notif.type === 'comment_content') { commentContent.push(notif); }
-        if (notif.type === 'comment_mention') { commentMention.push(notif); }
-      });
-
-      data.items = [
-        ...commentMention,
-        ...commentContent,
-        ...contentVote,
-        ...commentVote,
-        ...commentDiscuss,
-        ...alreadyRead,
-      ];
-
-      console.timeEnd('qualitySort');
-    } else {
-      console.time('timeSort');
-      const tempItems = data.items;
-      tempItems.sort((a, b) => {
-        return b.created_time - a.created_time;
-      });
-      data.items = tempItems;
-      console.timeEnd('timeSort');
-    }
-
     return (
       <div className="notif_bubble_container">
         {
@@ -73,7 +31,6 @@ class NotifBubbles extends PureComponent {
 
 NotifBubbles.propTypes = {
   data: PropTypes.object.isRequired,
-  sort: PropTypes.object.isRequired,
   open: PropTypes.func.isRequired,
 };
 

From a26a1222da8bbcd39bd87935c59c9087f503f6d2 Mon Sep 17 00:00:00 2001
From: Tahnik Mustasin <tahnik@live.co.uk>
Date: Tue, 2 Jan 2018 23:08:09 +0600
Subject: [PATCH 25/63] removed space for consistency

---
 app/src/js/components/notifs/notif_bubbles.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/src/js/components/notifs/notif_bubbles.js b/app/src/js/components/notifs/notif_bubbles.js
index c0887ebb..347f9de5 100644
--- a/app/src/js/components/notifs/notif_bubbles.js
+++ b/app/src/js/components/notifs/notif_bubbles.js
@@ -5,11 +5,9 @@ import Notification from './notif_bubble';
 class NotifBubbles extends PureComponent {
   render() {
     const { data, open } = this.props;
-
     if (!data) {
       return <div />;
     }
-
     return (
       <div className="notif_bubble_container">
         {

From a6ad1796e7cf21962b714fb0f0c842486713f34a Mon Sep 17 00:00:00 2001
From: Tahnik Mustasin <tahnik@live.co.uk>
Date: Tue, 2 Jan 2018 23:09:46 +0600
Subject: [PATCH 26/63] reverted notifs.js

---
 app/src/js/components/notifs/notifs.js | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/app/src/js/components/notifs/notifs.js b/app/src/js/components/notifs/notifs.js
index 0b9deb05..e161aa5e 100644
--- a/app/src/js/components/notifs/notifs.js
+++ b/app/src/js/components/notifs/notifs.js
@@ -12,7 +12,6 @@ class Notifs extends Component {
       notifTimestamp: 1,
       active: false,
       firstFetch: true,
-      sort: false,
     };
   }
   componentDidMount() {
@@ -23,11 +22,6 @@ class Notifs extends Component {
      */
     const { fetchNotifs } = this.props;
 
-    if (localStorage.getItem('notifsort') === null) { localStorage.setItem('notifsort', false); }
-
-    // eslint-disable-next-line
-    this.setState({ sort: localStorage.getItem('notifsort') }); 
-
     fetchNotifs();
 
     setInterval(() => {
@@ -67,10 +61,6 @@ class Notifs extends Component {
       this.setState({ active: !this.state.active });
     }
   }
-  toggleSort() {
-    this.setState({ sort: !this.state.sort });
-    localStorage.setItem('notifsort', this.state.sort);
-  }
   render() {
     const { notifs, auth, open, clearNotifs } = this.props;
 
@@ -108,11 +98,7 @@ class Notifs extends Component {
             className="notifs_clear"
             onClick={() => { clearNotifs(); }}
           >Clear All</button>
-          <button
-            className="notifs_clear notifs_sort"
-            onClick={() => { this.toggleSort(); }}
-          >{this.state.sort ? 'Sort by Time' : 'Sort by Quality'}</button>
-          <NotifBubbles data={notifs} open={open} sort={this.state.sort} />
+          <NotifBubbles data={notifs} open={open} />
         </div>
         <div className={`notifs_bubbles_container ${this.state.active ? 'active' : ''}`} />
       </div>

From ee070fcb1c961c3e5a6f6a59ac54b106f4edf812 Mon Sep 17 00:00:00 2001
From: RekkyRek <haslun16@edu.vilehlmina.se>
Date: Tue, 2 Jan 2018 18:11:29 +0100
Subject: [PATCH 27/63] Fixed tags color

---
 app/src/js/components/item/item_card.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/js/components/item/item_card.js b/app/src/js/components/item/item_card.js
index b9150262..703c9f6c 100644
--- a/app/src/js/components/item/item_card.js
+++ b/app/src/js/components/item/item_card.js
@@ -157,7 +157,7 @@ class ItemCard extends Component {
     this.props.history.replace(`/search/${term}`);
   }
   getTags() {
-    const { item } = this.props;
+    const { item, theme } = this.props;
     if (!item.tags) {
       return <div />;
     }
@@ -168,6 +168,7 @@ class ItemCard extends Component {
             <span
               key={object}
               className="tag"
+              style={{ backgroundColor: theme.backgroundColor }}
               onClick={() => this.handleTagClick(object)}
             >{object}
             </span>

From 20df631c6ebc1c17c19d8022da7f388693c4d977 Mon Sep 17 00:00:00 2001
From: RekkyRek <haslun16@edu.vilehlmina.se>
Date: Tue, 2 Jan 2018 18:13:16 +0100
Subject: [PATCH 28/63] Fixed sidebar items color

---
 app/src/js/components/navigation/items.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/js/components/navigation/items.js b/app/src/js/components/navigation/items.js
index 0b198e1a..d98803bd 100644
--- a/app/src/js/components/navigation/items.js
+++ b/app/src/js/components/navigation/items.js
@@ -7,7 +7,7 @@ const Items = ({
   <div
     className={`item ${className} ${active}`}
     onClick={() => onClick()}
-    style={{ backgroundColor: theme.item_card.backgroundColor }}
+    style={{ backgroundColor: theme.item_card.backgroundColor, color: theme.item_card.color }}
   >
     <i className={item.icon} />{ item.name }
   </div>

From dcb106576e5d853ae4819aef2dd0899a02421200 Mon Sep 17 00:00:00 2001
From: RekkyRek <haslun16@edu.vilehlmina.se>
Date: Tue, 2 Jan 2018 18:53:28 +0100
Subject: [PATCH 29/63] Vote buttons now match theme

---
 app/src/js/components/item/bottom_bar.js | 17 ++++++++++++++
 app/src/res/sass/modules/bottom_bar.sass | 29 +++++++++---------------
 2 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/app/src/js/components/item/bottom_bar.js b/app/src/js/components/item/bottom_bar.js
index 8d4b7ba0..e17e5d75 100644
--- a/app/src/js/components/item/bottom_bar.js
+++ b/app/src/js/components/item/bottom_bar.js
@@ -93,6 +93,7 @@ class BottomBar extends Component {
       theme.comment_card.backgroundColor : theme.item_card.backgroundColor;
     const color = type === ITEM.COMMENT.NAME ?
       theme.comment_card.color : theme.item_card.color;
+    const voteColor = theme.plus_notif.backgroundColor;
     return (
       <div
         className="bottom_bar_container"
@@ -104,8 +105,16 @@ class BottomBar extends Component {
             disabled={disabled}
             onClick={() => this.vote(1)}
           >
+            <div
+              style={{ backgroundColor: voteColor }}
+              className={`before ${this.state.isVoted > 0 ? 'votebefore' : ''}`}
+            />
             <span className="ud_icon">+</span>
             <span className="ud_icon">+</span>
+            <div
+              style={{ borderColor: this.state.isVoted > 0 ? `${voteColor}` : 'rgba(0,0,0,0)' }}
+              className={`${this.state.isVoted > 0 ? 'voteafter' : ''} after`}
+            />
           </div>
           <div className="score" >
             <span>{ this.state.score }</span>
@@ -115,8 +124,16 @@ class BottomBar extends Component {
             disabled={disabled}
             className={`downvote ${disabled} ${this.state.isVoted < 0 ? 'downvoted' : ''}`}
           >
+            <div
+              style={{ backgroundColor: voteColor }}
+              className={`before ${this.state.isVoted < 0 ? 'votebefore' : ''}`}
+            />
             <span className="ud_icon">-</span>
             <span className="ud_icon">-</span>
+            <div
+              style={{ borderColor: this.state.isVoted < 0 ? `${voteColor}` : 'rgba(0,0,0,0)' }}
+              className={`${this.state.isVoted < 0 ? 'voteafter' : ''} after`}
+            />
           </div>
         </div>
         <div
diff --git a/app/src/res/sass/modules/bottom_bar.sass b/app/src/res/sass/modules/bottom_bar.sass
index 0d0a7b18..836db14e 100644
--- a/app/src/res/sass/modules/bottom_bar.sass
+++ b/app/src/res/sass/modules/bottom_bar.sass
@@ -30,21 +30,14 @@
         opacity: 0.5
         cursor: default
           cursor: default
-      &.upvoted::before
-        transform: scale(1)
-      &.downvoted::before
-        transform: scale(1)
-      &.upvoted::after
-        border: 4px solid #D55161
-        transform: scale(1.4)
-        opacity: 0
-        transition: all 0.64s cubic-bezier(0.4, 0, 0, 1.3) !important
-      &.downvoted::after
-        border: 4px solid #D55161
-        transform: scale(1.4)
-        opacity: 0
-        transition: all 0.64s cubic-bezier(0.4, 0, 0, 1.3) !important
-      &::before
+      .votebefore
+        transform: scale(1) !important
+      .voteafter
+        border: 4px solid
+        transform: scale(1.4) !important
+        opacity: 0 !important
+        transition: all 0.64s cubic-bezier(0.4, 0, 0, 1.3)
+      .before
         content: " "
         height: 2rem
         width: 2rem
@@ -55,8 +48,8 @@
         background-color: #D55161
         z-index: 95
         transform: scale(0)
-        transition: transform 0.32s cubic-bezier(0.4, 0, 0, 1.3)
-      &::after
+        transition: all 0.32s cubic-bezier(0.4, 0, 0, 1.3)
+      .after
         content: " "
         height: calc(2rem - 4px)
         width: calc(2rem - 4px)
@@ -68,7 +61,7 @@
         transform: scale(1)
         opacity: 1
         z-index: 100
-        transition: all 0s cubic-bezier(0.4, 0, 0, 1.3)
+        transition: all 0.64s cubic-bezier(0.4, 0, 0, 1.3)
     .upvote
       span:nth-child(1)
         padding-right: 0.1rem

From 92d403948200bc8414a31560a26588f981bb5341 Mon Sep 17 00:00:00 2001
From: Tahnik Mustasin <tahnik@live.co.uk>
Date: Wed, 3 Jan 2018 00:05:26 +0600
Subject: [PATCH 30/63] fixed some theme bugs

---
 app/src/js/components/settings/general.js  | 29 ++++++++++++++++------
 app/src/js/components/settings/settings.js |  2 +-
 app/src/js/components/settings/theme.js    |  5 +++-
 app/src/res/sass/modules/item_card.sass    |  2 +-
 app/src/res/sass/modules/settings.sass     |  5 ----
 5 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/app/src/js/components/settings/general.js b/app/src/js/components/settings/general.js
index c1cbe843..bd787e7c 100644
--- a/app/src/js/components/settings/general.js
+++ b/app/src/js/components/settings/general.js
@@ -63,7 +63,7 @@ class General extends Component {
     }
   }
   getSettings() {
-    const { general } = this.props;
+    const { general, theme } = this.props;
     const settings = [];
     Object.keys(general).forEach((key) => {
       const setting = general[key];
@@ -78,19 +78,33 @@ class General extends Component {
           );
           subSettings.push(settingComponent);
         });
-        settings.push(<div className="multi_settings" key={key}>
+        settings.push(<div
+          className="multi_settings"
+          style={{
+            backgroundColor: theme.item_card.backgroundColor,
+            color: theme.item_card.color,
+          }}
+          key={key}
+        >
           { Header }
           <div className="options">
             {
-                subSettings.map(s => s)
-              }
+              subSettings.map(s => s)
+            }
           </div>
-                      </div>);
+        </div>);
       } else {
         const component = this.getSettingComponent(setting, key);
-        settings.push(<div className="single_settings" key={key}>
+        settings.push(<div
+          className="single_settings"
+          key={key}
+          style={{
+            backgroundColor: theme.item_card.backgroundColor,
+            color: theme.item_card.color,
+          }}
+        >
           { component }
-                      </div>);
+        </div>);
       }
     });
     return settings;
@@ -110,6 +124,7 @@ class General extends Component {
 General.propTypes = {
   general: PropTypes.object.isRequired,
   changeGeneral: PropTypes.func.isRequired,
+  theme: PropTypes.object.isRequired,
 };
 
 export default General;
diff --git a/app/src/js/components/settings/settings.js b/app/src/js/components/settings/settings.js
index 0f43f0ff..9240b35a 100644
--- a/app/src/js/components/settings/settings.js
+++ b/app/src/js/components/settings/settings.js
@@ -25,7 +25,7 @@ class Items extends Component {
     } = this.props;
     if (activeNav === SETTINGS_NAV[0]) {
       return (
-        <General general={settings.general} changeGeneral={changeGeneral} />
+        <General general={settings.general} changeGeneral={changeGeneral} {...this.props} />
       );
     } else if (activeNav === SETTINGS_NAV[1]) {
       return <Theme theme={theme} {...this.props} />;
diff --git a/app/src/js/components/settings/theme.js b/app/src/js/components/settings/theme.js
index ba753b54..9077562a 100644
--- a/app/src/js/components/settings/theme.js
+++ b/app/src/js/components/settings/theme.js
@@ -136,7 +136,10 @@ class Theme extends Component {
   render() {
     const { theme } = this.state;
     return (
-      <div className="theme_container" style={{ backgroundColor: theme.item_card.backgroundColor }}>
+      <div
+        className="theme_container"
+        style={{ backgroundColor: theme.item_card.backgroundColor, color: theme.item_card.color }}
+      >
         <div className="items_container">
           { this.getThemes() }
         </div>
diff --git a/app/src/res/sass/modules/item_card.sass b/app/src/res/sass/modules/item_card.sass
index 901b0ce0..288dccba 100644
--- a/app/src/res/sass/modules/item_card.sass
+++ b/app/src/res/sass/modules/item_card.sass
@@ -14,7 +14,7 @@
         padding: 0.2rem 0
         display: block
         a
-          color: white
+          color: inherit
       span.title
         font-size: 0.9rem
         color: grey
diff --git a/app/src/res/sass/modules/settings.sass b/app/src/res/sass/modules/settings.sass
index 0607f453..6a511095 100644
--- a/app/src/res/sass/modules/settings.sass
+++ b/app/src/res/sass/modules/settings.sass
@@ -27,7 +27,6 @@
     height: calc(100vh - 2.8rem)
     overflow-y: scroll
     .theme_container
-      color: white
       padding: 0.8rem
       display: flex
       margin-top: 2rem
@@ -73,14 +72,12 @@
         display: flex
         justify-content: center
         margin: 4rem 0 1rem 0
-        color: white
       .multi_settings
         margin-bottom: 18px
         background: #40415a
         padding: 0.8rem
         box-shadow: 2px 2px 5px rgba(0,0,0,0.2)
         .header
-          color: white
           padding: 0.3rem 0
         .options
           margin-left: 1.5rem
@@ -94,7 +91,6 @@
         display: flex
         justify-content: space-between
         align-items: center
-        color: white
         margin: 0.6rem 0 0 0
         ::-webkit-input-placeholder
           color: #bbb
@@ -109,7 +105,6 @@
           margin: 0.6rem 0 0 0
           cursor: pointer
           .setting_label
-            color: white
             user-select: none
           .setting_option
             display: flex

From 9d5c392b7e94ced81fe67f3eea05ee0ef6eb5fca Mon Sep 17 00:00:00 2001
From: Tahnik Mustasin <tahnik@live.co.uk>
Date: Wed, 3 Jan 2018 00:11:24 +0600
Subject: [PATCH 31/63] fixed topbar color

---
 app/src/js/components/columns/column_topbar.js | 5 ++++-
 app/src/res/sass/modules/column.sass           | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/src/js/components/columns/column_topbar.js b/app/src/js/components/columns/column_topbar.js
index be824a7d..44c5132b 100644
--- a/app/src/js/components/columns/column_topbar.js
+++ b/app/src/js/components/columns/column_topbar.js
@@ -212,7 +212,10 @@ class ColumnTopBar extends Component {
       <div
         className="column_topbar"
         onMouseLeave={() => this.handleHoverLeave()}
-        style={{ width: `${theme.column.width}px` }}
+        style={{
+          width: `${theme.column.width}px`,
+          color: theme.item_card.color,
+        }}
       >
         <div className="left_navs">
           <div
diff --git a/app/src/res/sass/modules/column.sass b/app/src/res/sass/modules/column.sass
index 22743370..08799d80 100644
--- a/app/src/res/sass/modules/column.sass
+++ b/app/src/res/sass/modules/column.sass
@@ -87,7 +87,7 @@
         transition: all 0.5s
         span
           margin: 0 1rem 0 0
-          color: white
+          color: inherit
           opacity: 0.4
           transition: all 0.1s
           text-transform: capitalize
@@ -107,7 +107,7 @@
         transition: all 0.5s
         span
           margin: 0 1rem 0 0;
-          color: white
+          color: inherit
           opacity: 0.4
           transition: all 0.1s
           text-transform: capitalize

From 21461ac21abcc983cd7c9c6e45f414c15a624cc6 Mon Sep 17 00:00:00 2001
From: Tahnik Mustasin <tahnik@live.co.uk>
Date: Wed, 3 Jan 2018 00:13:17 +0600
Subject: [PATCH 32/63] fixed right navs

---
 app/src/res/sass/modules/column.sass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/res/sass/modules/column.sass b/app/src/res/sass/modules/column.sass
index 08799d80..cf6a30b4 100644
--- a/app/src/res/sass/modules/column.sass
+++ b/app/src/res/sass/modules/column.sass
@@ -60,7 +60,7 @@
     .right_navs
       flex: 2
       padding: 3px 0 0 0
-      color: white
+      color: inherit
       display: flex
       justify-content: flex-end
       span

From aa028c28c274d99f6947407217386618acc98ac2 Mon Sep 17 00:00:00 2001
From: RekkyRek <haslun16@edu.vilehlmina.se>
Date: Tue, 2 Jan 2018 19:17:31 +0100
Subject: [PATCH 33/63] Fixed vote hover color

---
 app/src/js/components/item/bottom_bar.js | 14 ++++++++++++++
 app/src/res/sass/modules/bottom_bar.sass |  2 --
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/app/src/js/components/item/bottom_bar.js b/app/src/js/components/item/bottom_bar.js
index e17e5d75..59155e20 100644
--- a/app/src/js/components/item/bottom_bar.js
+++ b/app/src/js/components/item/bottom_bar.js
@@ -16,6 +16,8 @@ class BottomBar extends Component {
       triggerActive: false,
       favorited: false,
       subscribed: false,
+      plusHover: false,
+      minusHover: false,
     };
   }
   componentWillMount() {
@@ -83,6 +85,12 @@ class BottomBar extends Component {
     }
     return <div />;
   }
+  togglePlusHover() {
+    this.setState({ plusHover: !this.state.plusHover });
+  }
+  toggleMinusHover() {
+    this.setState({ minusHover: !this.state.minusHover });
+  }
   render() {
     const {
       type, item, onDelete, theme,
@@ -103,6 +111,9 @@ class BottomBar extends Component {
           <div
             className={`upvote ${disabled} ${this.state.isVoted > 0 ? 'upvoted' : ''}`}
             disabled={disabled}
+            style={{ backgroundColor: this.state.plusHover ? theme.backgroundColor : '' }}
+            onMouseEnter={this.togglePlusHover.bind(this)}
+            onMouseLeave={this.togglePlusHover.bind(this)}
             onClick={() => this.vote(1)}
           >
             <div
@@ -123,6 +134,9 @@ class BottomBar extends Component {
             onClick={() => this.vote(-1)}
             disabled={disabled}
             className={`downvote ${disabled} ${this.state.isVoted < 0 ? 'downvoted' : ''}`}
+            style={{ backgroundColor: this.state.minusHover ? theme.backgroundColor : '' }}
+            onMouseEnter={this.toggleMinusHover.bind(this)}
+            onMouseLeave={this.toggleMinusHover.bind(this)}
           >
             <div
               style={{ backgroundColor: voteColor }}
diff --git a/app/src/res/sass/modules/bottom_bar.sass b/app/src/res/sass/modules/bottom_bar.sass
index 836db14e..10b4be2f 100644
--- a/app/src/res/sass/modules/bottom_bar.sass
+++ b/app/src/res/sass/modules/bottom_bar.sass
@@ -24,8 +24,6 @@
       position: relative
       .ud_icon
         z-index: 100
-      &:hover
-        background-color: rgb(84, 85, 110)
       &.disabled
         opacity: 0.5
         cursor: default

From 19dff004dd09abc88e31daa04f87fdb45e2d40f5 Mon Sep 17 00:00:00 2001
From: RekkyRek <haslun16@edu.vilehlmina.se>
Date: Tue, 2 Jan 2018 19:21:48 +0100
Subject: [PATCH 34/63] Fixed supporter badge color

---
 app/src/js/components/user/user_badge.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/js/components/user/user_badge.js b/app/src/js/components/user/user_badge.js
index 53ba169c..003e99e3 100644
--- a/app/src/js/components/user/user_badge.js
+++ b/app/src/js/components/user/user_badge.js
@@ -48,7 +48,7 @@ class UserBadge extends Component {
           </span>
           {user.dpp === 1 && <span
             className="score"
-            style={{ background: `#${user.avatar.b}` }}
+            style={{ color: '#ffffff', background: `#${user.avatar.b}` }}
           ><span>Supporter</span>
                              </span>}
         </div>

From 409a32f023f94232449bc0d30d99c843c1b978e5 Mon Sep 17 00:00:00 2001
From: RekkyRek <haslun16@edu.vilehlmina.se>
Date: Tue, 2 Jan 2018 19:31:22 +0100
Subject: [PATCH 35/63] More themes :tada:

---
 app/src/js/consts/types.js | 46 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/app/src/js/consts/types.js b/app/src/js/consts/types.js
index 1b044502..1f46a0e3 100644
--- a/app/src/js/consts/types.js
+++ b/app/src/js/consts/types.js
@@ -69,6 +69,52 @@ export const THEMES = {
       backgroundColor: '#D55161',
     },
   },
+  BLACK_THEME: {
+    name: 'Black Theme',
+    id: 'white_theme',
+    backgroundColor: '#000000',
+    item_card: {
+      backgroundColor: '#111111',
+      color: '#FFFFFF',
+    },
+    comment_card: {
+      backgroundColor: '#111111',
+      color: '#FFFFFF',
+    },
+    column: {
+      backgroundColor: '#54556E',
+      width: '450',
+    },
+    user_badge: {
+      details_back: '#54556E',
+    },
+    plus_notif: {
+      backgroundColor: '#FFFFFF',
+    },
+  },
+  WHITE_THEME: {
+    name: 'White Theme',
+    id: 'white_theme',
+    backgroundColor: '#F5F5F5',
+    item_card: {
+      backgroundColor: '#FFFFFF',
+      color: '#000000',
+    },
+    comment_card: {
+      backgroundColor: '#FFFFFF',
+      color: '#00000',
+    },
+    column: {
+      backgroundColor: '#54556E',
+      width: '450',
+    },
+    user_badge: {
+      details_back: '#54556E',
+    },
+    plus_notif: {
+      backgroundColor: '#000000',
+    },
+  },
   LIGHT_THEME: {
     name: 'Light Theme',
     id: 'light_theme',

From 71bf697a93026ab6c52853e4db620607263d4fe0 Mon Sep 17 00:00:00 2001
From: Tahnik Mustasin <tahnik@live.co.uk>
Date: Wed, 3 Jan 2018 00:33:38 +0600
Subject: [PATCH 36/63] fixed all linting errors

---
 .eslintrc.json                                |  6 ++--
 app/src/js/actions/settings.js                |  2 +-
 app/src/js/components/comments/comments.js    |  1 +
 .../components/emoji_picker/emoji_picker.js   |  2 +-
 app/src/js/components/item/bottom_bar.js      |  2 +-
 app/src/js/components/item/item_card.js       |  6 ++--
 app/src/js/components/navigation/sidenav.js   |  7 ----
 app/src/js/components/notifs/notif_bubble.js  |  6 ----
 app/src/js/components/notifs/notifs.js        |  2 --
 app/src/js/components/settings/general.js     | 34 +++++++++++--------
 app/src/js/components/settings/theme.js       |  6 +++-
 app/src/js/components/user/user_badge.js      |  7 ++--
 app/src/js/components/user/user_card.js       | 21 ++++++++----
 app/src/js/components/user/user_profile.js    | 28 ++++++++++-----
 app/src/js/components/utilities/post_rant.js  | 31 +++++++----------
 app/src/js/index.js                           |  1 +
 16 files changed, 86 insertions(+), 76 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index 985bc0cb..67e42bba 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -26,14 +26,16 @@
 				"everything-else",
 				"render"
 			]
-		}],
+    }],
+    "prefer-destructuring": 0,
 		"react/jsx-filename-extension": [1, {
 			"extensions": [".js", ".jsx"]
-		}],
+    }],
     "jsx-a11y/no-static-element-interactions": 0,
     "jsx-a11y/no-noninteractive-element-interactions": 0,
     "jsx-a11y/href-no-hash": "off",
     "jsx-a11y/click-events-have-key-events": "off",
+    "jsx-a11y/mouse-events-have-key-events": "off",
     "jsx-a11y/anchor-is-valid": ["warn", { "aspects": ["invalidHref"] }],
 		"import/no-dynamic-require": 0,
 		"import/no-extraneous-dependencies": "off",
diff --git a/app/src/js/actions/settings.js b/app/src/js/actions/settings.js
index ae920b43..e9b88f24 100644
--- a/app/src/js/actions/settings.js
+++ b/app/src/js/actions/settings.js
@@ -1,4 +1,4 @@
-import { SETTINGS, ITEM, THEMES } from '../consts/types';
+import { SETTINGS, ITEM } from '../consts/types';
 import { fetchUser } from './user';
 import { fetchNotifs } from './notifs';
 import { openModal } from './modal';
diff --git a/app/src/js/components/comments/comments.js b/app/src/js/components/comments/comments.js
index f2f5562f..aa2f4410 100644
--- a/app/src/js/components/comments/comments.js
+++ b/app/src/js/components/comments/comments.js
@@ -11,6 +11,7 @@ class Comments extends Component {
   constructor() {
     super();
     this.state = {
+      // eslint-disable-next-line
       item: null,
     };
   }
diff --git a/app/src/js/components/emoji_picker/emoji_picker.js b/app/src/js/components/emoji_picker/emoji_picker.js
index 04808913..6d52b0b5 100644
--- a/app/src/js/components/emoji_picker/emoji_picker.js
+++ b/app/src/js/components/emoji_picker/emoji_picker.js
@@ -23,7 +23,7 @@ const allEmojis = [];
 class EmojiPicker extends Component {
   constructor(props) {
     super(props);
-    this.state = { activeTab: 'people', search: '' };
+    this.state = { activeTab: 'people' };
   }
   componentWillMount() {
     emojiData.categories = [];
diff --git a/app/src/js/components/item/bottom_bar.js b/app/src/js/components/item/bottom_bar.js
index e17e5d75..2c66d1cb 100644
--- a/app/src/js/components/item/bottom_bar.js
+++ b/app/src/js/components/item/bottom_bar.js
@@ -87,7 +87,7 @@ class BottomBar extends Component {
     const {
       type, item, onDelete, theme,
     } = this.props;
-    const { favorited, subscribed } = this.state;
+    const { favorited } = this.state;
     const disabled = this.props.isUser ? 'disabled' : '';
     const backgroundColor = type === ITEM.COMMENT.NAME ?
       theme.comment_card.backgroundColor : theme.item_card.backgroundColor;
diff --git a/app/src/js/components/item/item_card.js b/app/src/js/components/item/item_card.js
index 703c9f6c..1dfc5423 100644
--- a/app/src/js/components/item/item_card.js
+++ b/app/src/js/components/item/item_card.js
@@ -163,7 +163,8 @@ class ItemCard extends Component {
     }
     return (
       <div>
-        {item.tags.length !== 0 && <div className="tags">
+        {item.tags.length !== 0 &&
+        <div className="tags">
           {item.tags.map(object => (
             <span
               key={object}
@@ -173,7 +174,8 @@ class ItemCard extends Component {
             >{object}
             </span>
           ))}
-        </div>}
+        </div>
+        }
       </div>
     );
   }
diff --git a/app/src/js/components/navigation/sidenav.js b/app/src/js/components/navigation/sidenav.js
index 8e5b4ef0..4e79779b 100644
--- a/app/src/js/components/navigation/sidenav.js
+++ b/app/src/js/components/navigation/sidenav.js
@@ -7,13 +7,6 @@ import { ITEM } from '../../consts/types';
 const { ipcRenderer } = require('electron');
 
 class SideNav extends Component {
-  constructor(props) {
-    super(props);
-    this.state = {
-      username: '',
-      password: '',
-    };
-  }
   componentDidMount() {
     ipcRenderer.on('compose_rant', () => { this.props.open(); });
     document.addEventListener('keydown', (e) => {
diff --git a/app/src/js/components/notifs/notif_bubble.js b/app/src/js/components/notifs/notif_bubble.js
index 509a6534..979efb07 100644
--- a/app/src/js/components/notifs/notif_bubble.js
+++ b/app/src/js/components/notifs/notif_bubble.js
@@ -3,12 +3,6 @@ import PropTypes from 'prop-types';
 import { getNotifText } from '../../consts/utils';
 
 class Notification extends Component {
-  constructor(props) {
-    super(props);
-    this.state = {
-      visable: false,
-    };
-  }
   shouldComponentUpdate(nextProps) {
     const { notif } = this.props;
     if (nextProps.unread === 0 && (notif.read === 1)) {
diff --git a/app/src/js/components/notifs/notifs.js b/app/src/js/components/notifs/notifs.js
index fa087bbe..9aa81bf6 100644
--- a/app/src/js/components/notifs/notifs.js
+++ b/app/src/js/components/notifs/notifs.js
@@ -9,9 +9,7 @@ class Notifs extends Component {
   constructor() {
     super();
     this.state = {
-      notifTimestamp: 1,
       active: false,
-      firstFetch: true,
     };
   }
   componentDidMount() {
diff --git a/app/src/js/components/settings/general.js b/app/src/js/components/settings/general.js
index bd787e7c..48b7b734 100644
--- a/app/src/js/components/settings/general.js
+++ b/app/src/js/components/settings/general.js
@@ -78,21 +78,24 @@ class General extends Component {
           );
           subSettings.push(settingComponent);
         });
-        settings.push(<div
-          className="multi_settings"
-          style={{
-            backgroundColor: theme.item_card.backgroundColor,
-            color: theme.item_card.color,
-          }}
-          key={key}
-        >
-          { Header }
-          <div className="options">
-            {
-              subSettings.map(s => s)
-            }
-          </div>
-        </div>);
+        /* eslint-disable */
+        settings.push(
+          <div
+            className="multi_settings"
+            style={{
+                backgroundColor: theme.item_card.backgroundColor,
+                color: theme.item_card.color,
+              }}
+            key={key}
+          >
+            { Header }
+            <div className="options">
+              {
+                  subSettings.map(s => s)
+                }
+            </div>
+          </div>,
+        );
       } else {
         const component = this.getSettingComponent(setting, key);
         settings.push(<div
@@ -105,6 +108,7 @@ class General extends Component {
         >
           { component }
         </div>);
+        /* eslint-enable */
       }
     });
     return settings;
diff --git a/app/src/js/components/settings/theme.js b/app/src/js/components/settings/theme.js
index 9077562a..05b9c400 100644
--- a/app/src/js/components/settings/theme.js
+++ b/app/src/js/components/settings/theme.js
@@ -1,5 +1,5 @@
 import React, { Component } from 'react';
-import { SketchPicker, CompactPicker, SliderPicker } from 'react-color';
+import { SliderPicker } from 'react-color';
 import PropTypes from 'prop-types';
 import Twemoji from 'react-twemoji';
 import { THEMES } from '../../consts/types';
@@ -43,6 +43,10 @@ class Theme extends Component {
     if (prevProps.theme !== this.props.theme) {
       const { theme } = this.props;
       const sharableTheme = `${theme.backgroundColor}, ${theme.item_card.backgroundColor}, ${theme.item_card.color}, ${theme.comment_card.backgroundColor}, ${theme.comment_card.color}, ${theme.plus_notif.backgroundColor}`;
+      /**
+       * Under if statement so it's okay to use
+       */
+      // eslint-disable-next-line
       this.setState({ sharableTheme, theme: this.props.theme });
     }
   }
diff --git a/app/src/js/components/user/user_badge.js b/app/src/js/components/user/user_badge.js
index 53ba169c..33d0da6f 100644
--- a/app/src/js/components/user/user_badge.js
+++ b/app/src/js/components/user/user_badge.js
@@ -25,7 +25,6 @@ class UserBadge extends Component {
     // const c =
     // ['dGFobmlr', 'RGFjZXhp', 'ZGZveA==', 'dHJvZ3Vz'].indexOf(btoa(user.username)) > -1 ?
     // `#${user.avatar.b}` : '#ffffff';
-    const c = '#ffffff';
 
     return (
       <div className="user_badge">
@@ -46,11 +45,13 @@ class UserBadge extends Component {
             style={{ backgroundColor: theme.backgroundColor }}
           >{user.score}
           </span>
-          {user.dpp === 1 && <span
+          {user.dpp === 1 &&
+          <span
             className="score"
             style={{ background: `#${user.avatar.b}` }}
           ><span>Supporter</span>
-                             </span>}
+          </span>
+          }
         </div>
       </div>
     );
diff --git a/app/src/js/components/user/user_card.js b/app/src/js/components/user/user_card.js
index fcb32e88..4a4f1047 100644
--- a/app/src/js/components/user/user_card.js
+++ b/app/src/js/components/user/user_card.js
@@ -66,11 +66,14 @@ class UserCard extends Component {
               style={{ backgroundColor: 'rgb(84, 85, 110)' }}
             >{user.score}
             </span>
-            {user.dpp === 1 && <span
+            {user.dpp === 1 &&
+            <span
               className="score"
               style={{ background: `#${user.avatar.b}` }}
-            ><span>Supporter</span>
-            </span>}
+            >
+              <span>Supporter</span>
+            </span>
+            }
           </div>
         </div>
 
@@ -80,16 +83,20 @@ class UserCard extends Component {
               { user.about !== '' && <li><i className="ion-person" /><p>{user.about}</p></li>}
               { user.skills !== '' && <li><i className="ion-code" /><p>{user.skills}</p></li>}
               { user.location !== '' && <li><i className="ion-ios-location" /><p>{user.location}</p></li>}
-              { user.github !== '' && <li><i className="ion-social-github" />
+              { user.github !== '' &&
+              <li><i className="ion-social-github" />
                 <p onClick={() => shell.openExternal(`https://www.github.com/${user.github}`)}>
                   {user.github}
                 </p>
-              </li>}
-              { user.website !== '' && <li><i className="ion-earth" />
+              </li>
+              }
+              { user.website !== '' &&
+              <li><i className="ion-earth" />
                 <p onClick={() => UserCard.openLink(user.website)}>
                   {user.website}
                 </p>
-              </li>}
+              </li>
+              }
             </ul>
           </div>
         </Twemoji>
diff --git a/app/src/js/components/user/user_profile.js b/app/src/js/components/user/user_profile.js
index 734609ec..4bf4be3e 100644
--- a/app/src/js/components/user/user_profile.js
+++ b/app/src/js/components/user/user_profile.js
@@ -208,23 +208,33 @@ class UserProfile extends Component {
             <Twemoji>
               <div className="other_infos">
                 <ul>
-                  { user.about !== '' && <li><i className="ion-person" />
+                  { user.about !== '' &&
+                  <li><i className="ion-person" />
                     <p>{user.about}</p>
-                  </li>}
-                  { user.skills !== '' && <li><i className="ion-code" />
+                  </li>
+                  }
+                  { user.skills !== '' &&
+                  <li><i className="ion-code" />
                     <p>{user.skills}</p>
-                  </li>}
-                  { user.location !== '' && <li><i className="ion-ios-location" /><p>{user.location}</p></li>}
-                  { user.github !== '' && <li style={{ cursor: 'pointer' }}><i className="ion-social-github" />
+                  </li>
+                  }
+                  { user.location !== '' &&
+                  <li><i className="ion-ios-location" /><p>{user.location}</p></li>
+                  }
+                  { user.github !== '' &&
+                  <li style={{ cursor: 'pointer' }}><i className="ion-social-github" />
                     <p onClick={() => shell.openExternal(`https://www.github.com/${user.github}`)}>
                       {user.github}
                     </p>
-                  </li>}
-                  { user.website !== '' && <li style={{ cursor: 'pointer' }}><i className="ion-earth" />
+                  </li>
+                  }
+                  { user.website !== '' &&
+                  <li style={{ cursor: 'pointer' }}><i className="ion-earth" />
                     <p onClick={() => UserProfile.openLink(user.website)}>
                       {user.website}
                     </p>
-                  </li>}
+                  </li>
+                  }
                 </ul>
               </div>
             </Twemoji>
diff --git a/app/src/js/components/utilities/post_rant.js b/app/src/js/components/utilities/post_rant.js
index 322985b6..d4b783bb 100644
--- a/app/src/js/components/utilities/post_rant.js
+++ b/app/src/js/components/utilities/post_rant.js
@@ -29,9 +29,8 @@ class PostRant extends Component {
   constructor() {
     super();
     this.state = {
-      rant_content: '',
+      rantContent: '',
       tags: '',
-      limitCrossed: null,
       disabled: false,
       type: 1,
       draftName: '',
@@ -47,7 +46,7 @@ class PostRant extends Component {
   componentWillMount() {
     const { postRant } = this.props;
     if (postRant.autoSave.content) {
-      this.setState({ rant_content: postRant.autoSave.content, tags: postRant.autoSave.tags });
+      this.setState({ rantContent: postRant.autoSave.content, tags: postRant.autoSave.tags });
     }
   }
 
@@ -61,20 +60,20 @@ class PostRant extends Component {
       .then((res) => {
         const rant = res.rant;
         this.setState({
-          rant_content: rant.text,
+          rantContent: rant.text,
           tags: rant.tags.join(),
         });
       });
   }
 
   componentWillUnmount() {
-    this.props.saveAutoSave({ content: this.state.rant_content, tags: this.state.tags });
+    this.props.saveAutoSave({ content: this.state.rantContent, tags: this.state.tags });
   }
 
   saveDraft() {
-    const { draftName, rant_content, tags } = this.state;
+    const { draftName, rantContent, tags } = this.state;
     if (draftName !== '') {
-      this.props.addDraft(draftName, { content: rant_content, tags });
+      this.props.addDraft(draftName, { content: rantContent, tags });
     }
   }
 
@@ -83,7 +82,7 @@ class PostRant extends Component {
     const draft = postRant.drafts[index];
     if (draft.name && draft.rant) {
       this.setState({
-        draftName: draft.name, rant_content: draft.rant.content, tags: draft.rant.tags,
+        draftName: draft.name, rantContent: draft.rant.content, tags: draft.rant.tags,
       });
     }
   }
@@ -109,15 +108,12 @@ class PostRant extends Component {
         }
         this.props.clearAutoSave();
         this.setState({
-          posting: false,
-          rant_content: '',
+          rantContent: '',
           tags: '',
-          limitCrossed: null,
         });
         this.props.open(ITEM.RANT.NAME, item.id);
       })
       .catch(() => {
-        this.setState({ posting: false });
       });
   }
 
@@ -141,23 +137,20 @@ class PostRant extends Component {
         }
         this.props.clearAutoSave();
         this.setState({
-          posting: false,
-          rant_content: '',
+          rantContent: '',
           tags: '',
-          limitCrossed: null,
           disabled: true,
         });
         this.props.open(ITEM.RANT.NAME, res.rant_id);
       })
       .catch(() => {
-        this.setState({ posting: false });
       });
   }
 
   render() {
     const { auth, item, postRant } = this.props;
     const { popup } = this.state;
-    if (item.id !== 0 && this.state.rant_content === '') {
+    if (item.id !== 0 && this.state.rantContent === '') {
       return (
         <div className="modal" >
           <Loading />
@@ -181,8 +174,8 @@ class PostRant extends Component {
           <div className="post_rant">
             <SmartArea
               onPost={(text, image) => this.onPost(text, image)}
-              value={this.state.rant_content}
-              onChange={text => this.setState({ rant_content: text })}
+              value={this.state.rantContent}
+              onChange={text => this.setState({ rantContent: text })}
               disabled={this.state.disabled || auth.user === null}
               placeholder="The rant starts here..."
               tags={this.state.tags}
diff --git a/app/src/js/index.js b/app/src/js/index.js
index 5b5f316c..f76ded8c 100644
--- a/app/src/js/index.js
+++ b/app/src/js/index.js
@@ -28,6 +28,7 @@ document.addEventListener('keydown', (e) => {
     // eslint-disable-next-line
     require('electron').remote.getCurrentWindow().toggleDevTools();
   } else if (e.which === 116) {
+    // eslint-disable-next-line
     location.reload();
   }
 });

From c36d34322616cd660a66179b9f57ec03431dfe92 Mon Sep 17 00:00:00 2001
From: RekkyRek <haslun16@edu.vilehlmina.se>
Date: Tue, 2 Jan 2018 19:35:56 +0100
Subject: [PATCH 37/63] Changed some default themes

---
 app/src/js/consts/types.js | 31 ++++---------------------------
 1 file changed, 4 insertions(+), 27 deletions(-)

diff --git a/app/src/js/consts/types.js b/app/src/js/consts/types.js
index 1f46a0e3..a23c9411 100644
--- a/app/src/js/consts/types.js
+++ b/app/src/js/consts/types.js
@@ -115,10 +115,10 @@ export const THEMES = {
       backgroundColor: '#000000',
     },
   },
-  LIGHT_THEME: {
-    name: 'Light Theme',
-    id: 'light_theme',
-    backgroundColor: '#94556E',
+  SOLARIZED_LIGHT: {
+    name: 'Solarized Light',
+    id: 'solarized_light',
+    backgroundColor: '#342345',
     item_card: {
       backgroundColor: '#40415A',
       color: '#FFFFFF',
@@ -141,29 +141,6 @@ export const THEMES = {
   SOLARIZED_DARK: {
     name: 'Solarized Dark',
     id: 'solarized_dark',
-    backgroundColor: '#342345',
-    item_card: {
-      backgroundColor: '#40415A',
-      color: '#FFFFFF',
-    },
-    comment_card: {
-      backgroundColor: '#40415A',
-      color: '#FFFFFF',
-    },
-    column: {
-      backgroundColor: '#54556E',
-      width: '450',
-    },
-    user_badge: {
-      details_back: '#54556E',
-    },
-    plus_notif: {
-      backgroundColor: '#D55161',
-    },
-  },
-  SOLARIZED_LIGHT: {
-    name: 'Solarized Light',
-    id: 'solarized_light',
     backgroundColor: '#230923',
     item_card: {
       backgroundColor: '#40415A',

From 741c676dfc1f1eb76157682b5f52761ec2e4ce64 Mon Sep 17 00:00:00 2001
From: Tahnik Mustasin <tahnik@live.co.uk>
Date: Wed, 3 Jan 2018 00:37:50 +0600
Subject: [PATCH 38/63] fixed settings top_nav

---
 app/src/js/components/settings/settings.js | 5 ++++-
 app/src/res/sass/modules/settings.sass     | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/src/js/components/settings/settings.js b/app/src/js/components/settings/settings.js
index 9240b35a..f531b1b2 100644
--- a/app/src/js/components/settings/settings.js
+++ b/app/src/js/components/settings/settings.js
@@ -36,7 +36,10 @@ class Items extends Component {
     const { activeNav } = this.state;
     return (
       <div className="settings">
-        <div className="top_nav">
+        <div
+          className="top_nav"
+          style={{ color: this.props.theme.item_card.color }}
+        >
           { SETTINGS_NAV.map(nav => (
             <div
               className={`nav ${activeNav === nav ? 'active' : ''}`}
diff --git a/app/src/res/sass/modules/settings.sass b/app/src/res/sass/modules/settings.sass
index 6a511095..867109aa 100644
--- a/app/src/res/sass/modules/settings.sass
+++ b/app/src/res/sass/modules/settings.sass
@@ -12,7 +12,7 @@
     height: 1.4rem
     .nav
       padding: 0 0.7rem
-      color: white
+      color: inherit
       transition: 0.1s all
       opacity: 0.4
       &:hover

From 55b32dfab866baffa0f953eb93b252164bbba9b8 Mon Sep 17 00:00:00 2001
From: RekkyRek <haslun16@edu.vilehlmina.se>
Date: Tue, 2 Jan 2018 19:38:45 +0100
Subject: [PATCH 39/63] Changed the solarized themes

---
 app/src/js/consts/types.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/js/consts/types.js b/app/src/js/consts/types.js
index a23c9411..d72470c2 100644
--- a/app/src/js/consts/types.js
+++ b/app/src/js/consts/types.js
@@ -120,11 +120,11 @@ export const THEMES = {
     id: 'solarized_light',
     backgroundColor: '#342345',
     item_card: {
-      backgroundColor: '#40415A',
+      backgroundColor: '#534661',
       color: '#FFFFFF',
     },
     comment_card: {
-      backgroundColor: '#40415A',
+      backgroundColor: '#534661',
       color: '#FFFFFF',
     },
     column: {
@@ -143,11 +143,11 @@ export const THEMES = {
     id: 'solarized_dark',
     backgroundColor: '#230923',
     item_card: {
-      backgroundColor: '#40415A',
+      backgroundColor: '#543254',
       color: '#FFFFFF',
     },
     comment_card: {
-      backgroundColor: '#40415A',
+      backgroundColor: '#543254',
       color: '#FFFFFF',
     },
     column: {

From e836238486ecd182ac70ae1077220061ac8da620 Mon Sep 17 00:00:00 2001
From: Tahnik Mustasin <tahnik@live.co.uk>
Date: Wed, 3 Jan 2018 00:55:55 +0600
Subject: [PATCH 40/63] fixed sidenav

---
 app/src/js/components/navigation/items.js | 42 ++++++++++++++++-------
 1 file changed, 30 insertions(+), 12 deletions(-)

diff --git a/app/src/js/components/navigation/items.js b/app/src/js/components/navigation/items.js
index d98803bd..a56a2114 100644
--- a/app/src/js/components/navigation/items.js
+++ b/app/src/js/components/navigation/items.js
@@ -1,17 +1,35 @@
-import React from 'react';
+import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 
-const Items = ({
-  item, onClick, className, active, theme,
-}) => (
-  <div
-    className={`item ${className} ${active}`}
-    onClick={() => onClick()}
-    style={{ backgroundColor: theme.item_card.backgroundColor, color: theme.item_card.color }}
-  >
-    <i className={item.icon} />{ item.name }
-  </div>
-);
+class Items extends Component {
+  constructor() {
+    super();
+    this.state = {
+      hovering: false,
+    };
+  }
+  render() {
+    const {
+      item, onClick, className, active, theme,
+    } = this.props;
+    const { hovering } = this.state;
+    return (
+      <div
+        className={`item ${className} ${active}`}
+        onClick={() => onClick()}
+        onMouseEnter={() => { this.setState({ hovering: true }); }}
+        onMouseLeave={() => { this.setState({ hovering: false }); }}
+        style={{
+          backgroundColor: active || hovering ?
+          theme.backgroundColor : theme.item_card.backgroundColor,
+          color: theme.item_card.color,
+        }}
+      >
+        <i className={item.icon} />{ item.name }
+      </div>
+    );
+  }
+}
 
 Items.propTypes = {
   item: PropTypes.object.isRequired,

From e32adb15fc8d9249e30d69a09f7f697fb00a2815 Mon Sep 17 00:00:00 2001
From: Tahnik Mustasin <tahnik@live.co.uk>
Date: Wed, 3 Jan 2018 01:04:00 +0600
Subject: [PATCH 41/63] Fixed notif and add rant colors

---
 app/src/js/components/navigation/sidenav.js | 5 ++++-
 app/src/js/components/notifs/notifs.js      | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/src/js/components/navigation/sidenav.js b/app/src/js/components/navigation/sidenav.js
index 4e79779b..49ef1c5a 100644
--- a/app/src/js/components/navigation/sidenav.js
+++ b/app/src/js/components/navigation/sidenav.js
@@ -73,7 +73,10 @@ class SideNav extends Component {
           <button
             onClick={() => open()}
             className="add_button"
-            style={{ backgroundColor: theme.plus_notif ? theme.plus_notif.backgroundColor : '#D55161' }}
+            style={{
+              backgroundColor: theme.plus_notif ? theme.plus_notif.backgroundColor : '#D55161',
+              color: theme.id === 'dark_theme' ? '#ffffff' : theme.item_card.backgroundColor,
+            }}
           >
             <i className="ion-plus-round" />
           </button>
diff --git a/app/src/js/components/notifs/notifs.js b/app/src/js/components/notifs/notifs.js
index 9aa81bf6..66eacc10 100644
--- a/app/src/js/components/notifs/notifs.js
+++ b/app/src/js/components/notifs/notifs.js
@@ -86,7 +86,10 @@ class Notifs extends Component {
       >
         <button
           className="notifs_ball"
-          style={{ backgroundColor: theme.plus_notif ? theme.plus_notif.backgroundColor : '#D55161' }}
+          style={{
+            backgroundColor: theme.plus_notif ? theme.plus_notif.backgroundColor : '#D55161',
+            color: theme.id === 'dark_theme' ? '#ffffff' : theme.item_card.backgroundColor,
+          }}
           onClick={() => { this.setState({ active: !this.state.active }); }}
         >
           <i className="ion-ios-bell" />

From cb56803e0b1a2f6acc46d9c4ed02461365352ee1 Mon Sep 17 00:00:00 2001
From: RekkyRek <haslun16@edu.vilehlmina.se>
Date: Tue, 2 Jan 2018 20:08:51 +0100
Subject: [PATCH 42/63] Added max-width to preset themes

---
 app/src/res/sass/modules/settings.sass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/res/sass/modules/settings.sass b/app/src/res/sass/modules/settings.sass
index 867109aa..acbad3e1 100644
--- a/app/src/res/sass/modules/settings.sass
+++ b/app/src/res/sass/modules/settings.sass
@@ -62,6 +62,7 @@
           cursor: pointer
           margin: 0.5rem
           padding: 1rem
+          max-width: 200px
           box-shadow: 1px 1px 6px rgba(0,0,0,0.33)
           .item_card
             pointer-events: none

From d4dadc686526182eb0dd02bfe1204fe9ecfeac5b Mon Sep 17 00:00:00 2001
From: RekkyRek <haslun16@edu.vilehlmina.se>
Date: Tue, 2 Jan 2018 20:11:18 +0100
Subject: [PATCH 43/63] Disabled smooth scrolling cause nobody like that shit
 lol

---
 app/src/app.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/app.js b/app/src/app.js
index 7a3b4f69..0a00abd1 100644
--- a/app/src/app.js
+++ b/app/src/app.js
@@ -29,6 +29,7 @@ const {
   REDUX_DEVTOOLS,
 } = require('electron-devtools-installer');
 
+app.commandLine.appendSwitch('disable-smooth-scrolling');
 
 // Keep a global reference of the window object, if you don't, the window will
 // be closed automatically when the JavaScript object is garbage collected.

From 8bc255ced3793878d5008dbf03e59efeb33a606e Mon Sep 17 00:00:00 2001
From: RekkyRek <haslun16@edu.vilehlmina.se>
Date: Tue, 2 Jan 2018 20:22:37 +0100
Subject: [PATCH 44/63] Reenabled smoothscrolling due to performance of many
 items being rendered.

---
 app/src/app.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/src/app.js b/app/src/app.js
index 0a00abd1..ba6d0403 100644
--- a/app/src/app.js
+++ b/app/src/app.js
@@ -29,8 +29,6 @@ const {
   REDUX_DEVTOOLS,
 } = require('electron-devtools-installer');
 
-app.commandLine.appendSwitch('disable-smooth-scrolling');
-
 // Keep a global reference of the window object, if you don't, the window will
 // be closed automatically when the JavaScript object is garbage collected.
 let mainWindow;

From b00a971810224b6b9dbf872f5a5233b29fdb24d2 Mon Sep 17 00:00:00 2001
From: Tahnik Mustasin <tahnik@live.co.uk>
Date: Wed, 3 Jan 2018 01:24:22 +0600
Subject: [PATCH 45/63] fixed voting buttons

---
 app/src/js/components/item/bottom_bar.js | 25 ++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/app/src/js/components/item/bottom_bar.js b/app/src/js/components/item/bottom_bar.js
index a2c4fe46..fc7b533f 100644
--- a/app/src/js/components/item/bottom_bar.js
+++ b/app/src/js/components/item/bottom_bar.js
@@ -102,6 +102,13 @@ class BottomBar extends Component {
     const color = type === ITEM.COMMENT.NAME ?
       theme.comment_card.color : theme.item_card.color;
     const voteColor = theme.plus_notif.backgroundColor;
+    let plusColor = theme.id === 'dark_theme' ? '#ffffff' : theme.item_card.color;
+    let minusColor = theme.id === 'dark_theme' ? '#ffffff' : theme.item_card.color;
+    if (this.state.isVoted > 0) {
+      plusColor = theme.id === 'dark_theme' ? '#ffffff' : theme.item_card.backgroundColor;
+    } else if (this.state.isVoted < 0) {
+      minusColor = theme.id === 'dark_theme' ? '#ffffff' : theme.item_card.backgroundColor;
+    }
     return (
       <div
         className="bottom_bar_container"
@@ -111,9 +118,12 @@ class BottomBar extends Component {
           <div
             className={`upvote ${disabled} ${this.state.isVoted > 0 ? 'upvoted' : ''}`}
             disabled={disabled}
-            style={{ backgroundColor: this.state.plusHover ? theme.backgroundColor : '' }}
-            onMouseEnter={this.togglePlusHover.bind(this)}
-            onMouseLeave={this.togglePlusHover.bind(this)}
+            style={{
+              backgroundColor: this.state.plusHover ? theme.backgroundColor : '',
+              color: plusColor,
+            }}
+            onMouseEnter={() => { this.togglePlusHover(); }}
+            onMouseLeave={() => { this.togglePlusHover(); }}
             onClick={() => this.vote(1)}
           >
             <div
@@ -134,9 +144,12 @@ class BottomBar extends Component {
             onClick={() => this.vote(-1)}
             disabled={disabled}
             className={`downvote ${disabled} ${this.state.isVoted < 0 ? 'downvoted' : ''}`}
-            style={{ backgroundColor: this.state.minusHover ? theme.backgroundColor : '' }}
-            onMouseEnter={this.toggleMinusHover.bind(this)}
-            onMouseLeave={this.toggleMinusHover.bind(this)}
+            style={{
+              backgroundColor: this.state.minusHover ? theme.backgroundColor : '',
+              color: minusColor,
+            }}
+            onMouseEnter={() => { this.toggleMinusHover(); }}
+            onMouseLeave={() => { this.toggleMinusHover(); }}
           >
             <div
               style={{ backgroundColor: voteColor }}

From 95cda3dc044fd4e3dedea7180062a451fca3d4d9 Mon Sep 17 00:00:00 2001
From: RekkyRek <haslun16@edu.vilehlmina.se>
Date: Tue, 2 Jan 2018 20:26:28 +0100
Subject: [PATCH 46/63] Fixed version number color

---
 app/src/js/components/settings/general.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/src/js/components/settings/general.js b/app/src/js/components/settings/general.js
index 48b7b734..c9c41682 100644
--- a/app/src/js/components/settings/general.js
+++ b/app/src/js/components/settings/general.js
@@ -119,7 +119,12 @@ class General extends Component {
         {
           this.getSettings().map(s => s)
         }
-        <div className="version_number">v{remote.app.getVersion()}</div>
+        <div
+          className="version_number"
+          style={{ color: this.props.theme.item_card.color }}
+        >
+          v{remote.app.getVersion()}
+        </div>
       </div>
     );
   }

From 378f69ef9b915d0e60d8170cc0b3365babe50176 Mon Sep 17 00:00:00 2001
From: RekkyRek <haslun16@edu.vilehlmina.se>
Date: Tue, 2 Jan 2018 20:32:34 +0100
Subject: [PATCH 47/63] Fixed settings input color

---
 app/src/js/components/settings/general.js | 1 +
 app/src/js/components/settings/text.js    | 2 ++
 app/src/js/components/settings/theme.js   | 7 +++++++
 3 files changed, 10 insertions(+)

diff --git a/app/src/js/components/settings/general.js b/app/src/js/components/settings/general.js
index c9c41682..1df32cf4 100644
--- a/app/src/js/components/settings/general.js
+++ b/app/src/js/components/settings/general.js
@@ -41,6 +41,7 @@ class General extends Component {
           <Text
             key={secondaryKey}
             setting={setting}
+            theme={this.props.theme}
             handleChange={(value) => {
               this.handleChange(primaryKey, secondaryKey, value);
             }}
diff --git a/app/src/js/components/settings/text.js b/app/src/js/components/settings/text.js
index 9366fe1d..a6ebdb0d 100644
--- a/app/src/js/components/settings/text.js
+++ b/app/src/js/components/settings/text.js
@@ -9,6 +9,7 @@ const Text = props => (
         onChange={e => props.handleChange(e.target.value)}
         placeholder={props.setting.placeholder}
         value={props.setting.value}
+        style={{ color: props.theme.item_card.color }}
       />
     </div>
   </div>
@@ -16,6 +17,7 @@ const Text = props => (
 
 Text.propTypes = {
   setting: PropTypes.object.isRequired,
+  theme: PropTypes.object.isRequired,
   handleChange: PropTypes.func.isRequired,
 };
 
diff --git a/app/src/js/components/settings/theme.js b/app/src/js/components/settings/theme.js
index 05b9c400..dcda8a72 100644
--- a/app/src/js/components/settings/theme.js
+++ b/app/src/js/components/settings/theme.js
@@ -168,6 +168,7 @@ class Theme extends Component {
                     this.setState({ theme: { ...theme, backgroundColor: e.target.value } });
                     this.changeTheme();
                   }}
+                  style={{ color: theme.item_card.color }}
                   value={theme.backgroundColor}
                 />
               </div>
@@ -195,6 +196,7 @@ class Theme extends Component {
                     });
                     this.changeTheme();
                   }}
+                  style={{ color: theme.item_card.color }}
                   value={theme.item_card.backgroundColor}
                 />
               </div>
@@ -222,6 +224,7 @@ class Theme extends Component {
                     });
                     this.changeTheme();
                   }}
+                  style={{ color: theme.item_card.color }}
                   value={theme.item_card.color}
                 />
               </div>
@@ -249,6 +252,7 @@ class Theme extends Component {
                     });
                     this.changeTheme();
                   }}
+                  style={{ color: theme.item_card.color }}
                   value={theme.comment_card.backgroundColor}
                 />
               </div>
@@ -276,6 +280,7 @@ class Theme extends Component {
                     });
                     this.changeTheme();
                   }}
+                  style={{ color: theme.item_card.color }}
                   value={theme.comment_card.color}
                 />
               </div>
@@ -303,6 +308,7 @@ class Theme extends Component {
                     });
                     this.changeTheme();
                   }}
+                  style={{ color: theme.item_card.color }}
                   value={theme.plus_notif.backgroundColor}
                 />
               </div>
@@ -312,6 +318,7 @@ class Theme extends Component {
               <span className="sharable_title">Sharable theme string</span>
               <input
                 onChange={e => this.handleSharableTheme(e.target.value)}
+                style={{ color: theme.item_card.color }}
                 value={this.state.sharableTheme}
               />
             </div>

From befffcc42b1de164701fa07233de7d9746eab6d6 Mon Sep 17 00:00:00 2001
From: Tahnik Mustasin <tahnik@live.co.uk>
Date: Wed, 3 Jan 2018 01:58:18 +0600
Subject: [PATCH 48/63] fixed post rant colors

---
 .../js/components/comments/comment_post.js    |  1 +
 app/src/js/components/modal/modal.js          | 12 +++-
 app/src/js/components/search/search.js        |  5 +-
 app/src/js/components/utilities/post_rant.js  | 56 ++++++++++++++++---
 app/src/js/components/utilities/smart_area.js | 14 ++++-
 app/src/res/sass/modules/common.sass          |  2 +-
 app/src/res/sass/modules/post_rant.sass       |  8 +--
 app/src/res/sass/modules/search.sass          |  7 ++-
 8 files changed, 85 insertions(+), 20 deletions(-)

diff --git a/app/src/js/components/comments/comment_post.js b/app/src/js/components/comments/comment_post.js
index 7f9fc2ed..4f0a8ae7 100644
--- a/app/src/js/components/comments/comment_post.js
+++ b/app/src/js/components/comments/comment_post.js
@@ -111,6 +111,7 @@ class CommentPost extends Component {
           onChange={text => this.setState({ content: text })}
           ref={(node) => { this.smartArea = node; }}
           editing={this.state.editID !== 0}
+          theme={theme}
         />
       </div>
     );
diff --git a/app/src/js/components/modal/modal.js b/app/src/js/components/modal/modal.js
index 65f58fd9..77ae3559 100644
--- a/app/src/js/components/modal/modal.js
+++ b/app/src/js/components/modal/modal.js
@@ -42,7 +42,7 @@ class Modal extends Component {
     }
   }
   render() {
-    const { item, close } = this.props;
+    const { item, close, theme } = this.props;
     return (
       <CSSTransitionGroup
         transitionName="fade_item"
@@ -59,7 +59,14 @@ class Modal extends Component {
               onClick={e => this.onOutsideClick(e)}
               ref={(node) => { this.modal = node; }}
             >
-              <div className="close_modal" onClick={() => close()}>
+              <div
+                className="close_modal"
+                onClick={() => close()}
+                style={{
+                  background: theme.plus_notif ? theme.plus_notif.backgroundColor : '#dd4242',
+                  color: theme.id === 'dark_theme' ? '#ffffff' : theme.item_card.backgroundColor,
+                }}
+              >
                 <i className="ion-close-round" />
               </div>
               { this.getItem() }
@@ -75,6 +82,7 @@ class Modal extends Component {
 Modal.propTypes = {
   item: PropTypes.object,
   close: PropTypes.func.isRequired,
+  theme: PropTypes.object.isRequired,
 };
 
 export default Modal;
diff --git a/app/src/js/components/search/search.js b/app/src/js/components/search/search.js
index 938e9ffb..44951bb4 100644
--- a/app/src/js/components/search/search.js
+++ b/app/src/js/components/search/search.js
@@ -95,7 +95,10 @@ class Search extends Component {
   render() {
     const { theme } = this.props;
     return (
-      <div className="search_container">
+      <div
+        className="search_container"
+        style={{ color: theme.item_card.color }}
+      >
         <div className="search">
           <i className="ion-android-search" />
           <input
diff --git a/app/src/js/components/utilities/post_rant.js b/app/src/js/components/utilities/post_rant.js
index d4b783bb..8c92d25b 100644
--- a/app/src/js/components/utilities/post_rant.js
+++ b/app/src/js/components/utilities/post_rant.js
@@ -148,7 +148,9 @@ class PostRant extends Component {
   }
 
   render() {
-    const { auth, item, postRant } = this.props;
+    const {
+      auth, item, postRant, theme,
+    } = this.props;
     const { popup } = this.state;
     if (item.id !== 0 && this.state.rantContent === '') {
       return (
@@ -182,9 +184,16 @@ class PostRant extends Component {
               maxChar={5000}
               editing={item.id !== 0}
               onTagsChange={tags => this.setState({ tags })}
+              theme={theme}
             />
           </div>
-          <div className="utils" >
+          <div
+            className="utils"
+            style={{
+              backgroundColor: theme.backgroundColor,
+              color: theme.item_card.color,
+            }}
+          >
             <span className="header">Rant Type</span>
             <Dropdown
               items={RANT_TYPES}
@@ -194,14 +203,32 @@ class PostRant extends Component {
             <span className="header">Save draft</span>
             <div className="save_draft">
               <input
+                style={{ backgroundColor: theme.item_card.backgroundColor }}
                 onChange={e => this.setState({ draftName: e.currentTarget.value })}
                 value={this.state.draftName}
+                placeholder="Title of Draft"
               />
-              <button onClick={() => this.saveDraft()}>Save Draft</button>
+              <button
+                onClick={() => this.saveDraft()}
+                style={{
+                  backgroundColor: theme.plus_notif ? theme.plus_notif.backgroundColor : '#dd4242',
+                  color: theme.id === 'dark_theme' ? '#ffffff' : theme.item_card.backgroundColor,
+                }}
+              >Save Draft
+              </button>
             </div>
             <span className="header">Saved Drafts</span>
-            <div className="drafts_container">
-              <div className="drafts" >
+            <div
+              className="drafts_container"
+              style={{ backgroundColor: theme.item_card.backgroundColor }}
+            >
+              <div
+                className="drafts"
+                style={{
+                  backgroundColor: theme.item_card.backgroundColor,
+                  color: theme.item_card.color,
+                }}
+              >
                 {
                   postRant.drafts.length !== 0 ?
                     postRant.drafts.map((draft, index) => (
@@ -211,8 +238,22 @@ class PostRant extends Component {
                       >
                         <span className="d_name" >{draft.name}</span>
                         <div className="actions">
-                          <button onClick={() => this.getDraft(index)}>Load</button>
-                          <button onClick={() => this.removeDraft(draft.name)}>Delete</button>
+                          <button
+                            onClick={() => this.getDraft(index)}
+                            style={{
+                              background: theme.plus_notif ? theme.plus_notif.backgroundColor : '#dd4242',
+                              color: theme.id === 'dark_theme' ? '#ffffff' : theme.item_card.backgroundColor,
+                            }}
+                          >Load
+                          </button>
+                          <button
+                            onClick={() => this.removeDraft(draft.name)}
+                            style={{
+                              background: theme.plus_notif ? theme.plus_notif.backgroundColor : '#dd4242',
+                              color: theme.id === 'dark_theme' ? '#ffffff' : theme.item_card.backgroundColor,
+                            }}
+                          >Delete
+                          </button>
                         </div>
                       </div>
                     ))
@@ -230,6 +271,7 @@ class PostRant extends Component {
 
 PostRant.propTypes = {
   auth: PropTypes.object.isRequired,
+  theme: PropTypes.object.isRequired,
   item: PropTypes.object.isRequired,
   postRant: PropTypes.object.isRequired,
   open: PropTypes.func.isRequired,
diff --git a/app/src/js/components/utilities/smart_area.js b/app/src/js/components/utilities/smart_area.js
index a326fff7..9441dcb3 100644
--- a/app/src/js/components/utilities/smart_area.js
+++ b/app/src/js/components/utilities/smart_area.js
@@ -244,6 +244,7 @@ class SmartArea extends Component {
   }
   render() {
     const { pickerActive, selectedMention } = this.state;
+    const { theme } = this.props;
     const invalidContent = this.props.value.length < 5;
     const isPost = typeof this.props.tags !== 'undefined';
     let btnText = 'Post Rant';
@@ -309,11 +310,21 @@ class SmartArea extends Component {
           : null
         }
         <div className="post">
-          <button onClick={() => this.selectImage()}>
+          <button
+            onClick={() => this.selectImage()}
+            style={{
+              backgroundColor: theme.plus_notif ? theme.plus_notif.backgroundColor : '#dd4242',
+              color: theme.id === 'dark_theme' ? '#ffffff' : theme.item_card.backgroundColor,
+            }}
+          >
             {this.state.image === null && 'Add Image'}
             {this.state.image !== null && 'Remove Image'}
           </button>
           <button
+            style={{
+              backgroundColor: theme.plus_notif ? theme.plus_notif.backgroundColor : '#dd4242',
+              color: theme.id === 'dark_theme' ? '#ffffff' : theme.item_card.backgroundColor,
+            }}
             disabled={this.props.disabled || invalidContent}
             onClick={() => this.onPost()}
           >{btnText}
@@ -338,6 +349,7 @@ SmartArea.propTypes = {
   onTagsChange: PropTypes.func,
   placeholder: PropTypes.string.isRequired,
   maxChar: PropTypes.number.isRequired,
+  theme: PropTypes.object.isRequired,
 };
 
 export default SmartArea;
diff --git a/app/src/res/sass/modules/common.sass b/app/src/res/sass/modules/common.sass
index 85c922e1..686054b0 100644
--- a/app/src/res/sass/modules/common.sass
+++ b/app/src/res/sass/modules/common.sass
@@ -204,7 +204,7 @@ body
     &:active
       box-shadow: none
     &:disabled
-      background-color: grey
+      background-color: grey !important
       box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24)
   .toast
     position: fixed
diff --git a/app/src/res/sass/modules/post_rant.sass b/app/src/res/sass/modules/post_rant.sass
index 6dc21313..b3fb2344 100644
--- a/app/src/res/sass/modules/post_rant.sass
+++ b/app/src/res/sass/modules/post_rant.sass
@@ -24,7 +24,7 @@
         overflow-y: scroll
         flex: 1
         .noDrafts
-          color: white
+          color: inherit
           width: 100%
           height: 100%
           display: flex
@@ -34,7 +34,7 @@
           padding: 0.5rem
           display: flex
           align-items: center
-          color: white
+          color: inherit
           span
             text-transform: capitalize
           .actions
@@ -47,12 +47,10 @@
       input
         padding: 0 7px
         border: none
-        color: black
-        background-color: white
     .header
       display: block
       margin-bottom: 0.7rem
-      color: white
+      color: inherit
       font-size: 0.8rem
       opacity: 0.5
   .post_rant
diff --git a/app/src/res/sass/modules/search.sass b/app/src/res/sass/modules/search.sass
index be139ee2..7c98e946 100644
--- a/app/src/res/sass/modules/search.sass
+++ b/app/src/res/sass/modules/search.sass
@@ -11,7 +11,7 @@
     flex-wrap: wrap
     justify-content: center
     .term
-      color: white
+      color: inherit
       margin: 1rem 0
       display: flex
       justify-content: center
@@ -26,14 +26,15 @@
     align-items: center
     i
       font-size: 1.4rem
-      color: white
+      color: inherit
       margin-right: 5px
       display: flex
       align-items: center
     input
       font-size: 1.2rem
       padding: 0.2rem 0.2rem
+      color: inherit
       &:focus
         border-bottom: 0.12rem solid #C14857
       &::-webkit-input-placeholder
-        color: #e6e6e6
\ No newline at end of file
+        color: #e6e6e6

From fd0c5f752d1c8fb49f7242780d5175912859303d Mon Sep 17 00:00:00 2001
From: Tahnik Mustasin <tahnik@live.co.uk>
Date: Wed, 3 Jan 2018 02:15:56 +0600
Subject: [PATCH 49/63] fixed user profile

---
 app/src/js/components/user/user_profile.js |  5 ++++
 app/src/res/sass/modules/user_profile.sass | 29 ++++++++++++++--------
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/app/src/js/components/user/user_profile.js b/app/src/js/components/user/user_profile.js
index 4bf4be3e..fc96aab8 100644
--- a/app/src/js/components/user/user_profile.js
+++ b/app/src/js/components/user/user_profile.js
@@ -189,6 +189,7 @@ class UserProfile extends Component {
           style={{
             background: 'url(./res/images/profile_banner.png)',
             width: `${theme.column.width}px`,
+            color: theme.item_card.color,
           }}
         >
           {
@@ -197,6 +198,10 @@ class UserProfile extends Component {
                 <i className="ion-log-out" />
               </div> : null
           }
+          <div
+            className="background"
+            style={{ backgroundColor: theme.item_card.backgroundColor }}
+          />
           <div className="image">
             <img alt="" src={imageSource} style={{ backgroundColor: `#${user.avatar.b}` }} />
           </div>
diff --git a/app/src/res/sass/modules/user_profile.sass b/app/src/res/sass/modules/user_profile.sass
index bf3756f4..c8896c23 100644
--- a/app/src/res/sass/modules/user_profile.sass
+++ b/app/src/res/sass/modules/user_profile.sass
@@ -6,7 +6,6 @@
     position: absolute
     top: 10px
     right: 10px
-    color: white
     font-size: 1.5rem
     transition: all 0.2s
     &:hover
@@ -32,26 +31,36 @@
     position: relative
     *
       z-index: 100
-    &::before
-      content: " "
-      background: rgba(64, 65, 90, 0.9)
-      position: absolute
-      top: 0
-      left: 0
-      height: 100%
-      width: 100%
+    // &::before
+    //   content: " "
+    //   background: rgba(64, 65, 90, 0.9)
+    //   position: absolute
+    //   top: 0
+    //   left: 0
+    //   height: 100%
+    //   width: 100%
     .image
       flex: 2
       img
         width: 150px
         height: 150px
         border-radius: 100%
+    .background
+      position: absolute
+      width: 100%
+      height: 100%
+      top: 0
+      bottom: 0
+      left: 0
+      right: 0
+      opacity: 0.9
+      z-index: 99
     .details
       flex: 7
       display: flex
       padding: 0 1rem
       margin-top: 1rem
-      color: white
+      color: inherit
       flex-direction: column
       .name_score
         font-family: 'Roboto', sans-serif

From 86630eab74f3d7eb8feba4a5e033186bb81042c8 Mon Sep 17 00:00:00 2001
From: Tahnik Mustasin <tahnik@live.co.uk>
Date: Wed, 3 Jan 2018 02:18:16 +0600
Subject: [PATCH 50/63] fixed some indentation

---
 app/src/js/components/settings/theme.js | 3 ---
 app/src/res/sass/modules/settings.sass  | 1 +
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/src/js/components/settings/theme.js b/app/src/js/components/settings/theme.js
index dcda8a72..cbbf1aae 100644
--- a/app/src/js/components/settings/theme.js
+++ b/app/src/js/components/settings/theme.js
@@ -148,9 +148,6 @@ class Theme extends Component {
           { this.getThemes() }
         </div>
         <div className="custom_theme">
-          <div className="theme_settings">
-            <h4>Global</h4>
-          </div>
           <div className="theme_settings">
             <h4>Custom</h4>
             <div className="custom_colors">
diff --git a/app/src/res/sass/modules/settings.sass b/app/src/res/sass/modules/settings.sass
index acbad3e1..53bd7ff5 100644
--- a/app/src/res/sass/modules/settings.sass
+++ b/app/src/res/sass/modules/settings.sass
@@ -30,6 +30,7 @@
       padding: 0.8rem
       display: flex
       margin-top: 2rem
+      margin-bottom: 1rem
       position: relative
       flex-direction: column
       .custom_theme

From 5b6bd8f6ebf7e6d8a7a4c4734e92cd32b38d35a1 Mon Sep 17 00:00:00 2001
From: Tahnik Mustasin <tahnik@live.co.uk>
Date: Wed, 3 Jan 2018 02:21:14 +0600
Subject: [PATCH 51/63] fixed notif button color

---
 app/src/js/components/notifs/notifs.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/src/js/components/notifs/notifs.js b/app/src/js/components/notifs/notifs.js
index 66eacc10..92a86c27 100644
--- a/app/src/js/components/notifs/notifs.js
+++ b/app/src/js/components/notifs/notifs.js
@@ -101,6 +101,10 @@ class Notifs extends Component {
         </button>
         <div className={`notif_bubbles ${this.state.active ? 'active' : 'inactive'}`}>
           <button
+            style={{
+              backgroundColor: theme.plus_notif ? theme.plus_notif.backgroundColor : '#D55161',
+              color: theme.id === 'dark_theme' ? '#ffffff' : theme.item_card.backgroundColor,
+            }}
             className="notifs_clear"
             onClick={() => { clearNotifs(); }}
           >Clear All

From 764a00cc428db624dc59ed5a5eb5b3896f83335b Mon Sep 17 00:00:00 2001
From: Tahnik Mustasin <tahnik@live.co.uk>
Date: Wed, 3 Jan 2018 02:24:01 +0600
Subject: [PATCH 52/63] Reset cache and upgrade package.json

---
 .travis.yml       | 12 ++++++------
 appveyor.yml      |  4 ++--
 package-lock.json |  2 +-
 package.json      |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d9c440d4..17c8c7fc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,12 +15,12 @@ env:
     - ELECTRON_CACHE=$HOME/.cache/electron
     - ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder
 
-cache:
-  directories:
-  - node_modules
-  - $HOME/.cache/electron
-  - $HOME/.cache/electron-builder
-  - $HOME/.npm/_prebuilds
+# cache:
+#   directories:
+#   - node_modules
+#   - $HOME/.cache/electron
+#   - $HOME/.cache/electron-builder
+#   - $HOME/.npm/_prebuilds
 
 install:
 - npm i
diff --git a/appveyor.yml b/appveyor.yml
index a2e580a9..c2becd78 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,8 +1,8 @@
 os: unstable
 
 # cache yarn and node_modules folder for rebuilds
-cache:
-  - node_modules
+# cache:
+#   - node_modules
 
 # Do not build feature branch with open Pull Requests
 skip_branch_with_pr: true
diff --git a/package-lock.json b/package-lock.json
index 5d34c19e..bbc138a4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "devrantron",
-  "version": "1.4.6",
+  "version": "1.5.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 8e45794d..91105c91 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "devrantron",
-  "version": "1.4.6",
+  "version": "1.5.0",
   "main": "./build/app/app.js",
   "description": "An open source cross platform desktop application for devRant",
   "scripts": {

From b75ebbe801624e0503f7cfb4009d449d10cc5fa3 Mon Sep 17 00:00:00 2001
From: RekkyRek <haslun16@edu.vilehlmina.se>
Date: Tue, 2 Jan 2018 22:39:30 +0100
Subject: [PATCH 53/63] Fixed solarized to actually be solarized

---
 app/src/js/consts/types.js | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/src/js/consts/types.js b/app/src/js/consts/types.js
index d72470c2..948decfb 100644
--- a/app/src/js/consts/types.js
+++ b/app/src/js/consts/types.js
@@ -118,14 +118,14 @@ export const THEMES = {
   SOLARIZED_LIGHT: {
     name: 'Solarized Light',
     id: 'solarized_light',
-    backgroundColor: '#342345',
+    backgroundColor: '#fdf6e3',
     item_card: {
-      backgroundColor: '#534661',
-      color: '#FFFFFF',
+      backgroundColor: '#93a1a1',
+      color: '#073642',
     },
     comment_card: {
-      backgroundColor: '#534661',
-      color: '#FFFFFF',
+      backgroundColor: '#93a1a1',
+      color: '#073642',
     },
     column: {
       backgroundColor: '#54556E',
@@ -141,14 +141,14 @@ export const THEMES = {
   SOLARIZED_DARK: {
     name: 'Solarized Dark',
     id: 'solarized_dark',
-    backgroundColor: '#230923',
+    backgroundColor: '#002b36',
     item_card: {
-      backgroundColor: '#543254',
-      color: '#FFFFFF',
+      backgroundColor: '#586e75',
+      color: '#fdf6e3',
     },
     comment_card: {
-      backgroundColor: '#543254',
-      color: '#FFFFFF',
+      backgroundColor: '#586e75',
+      color: '#fdf6e3',
     },
     column: {
       backgroundColor: '#54556E',
@@ -158,7 +158,7 @@ export const THEMES = {
       details_back: '#54556E',
     },
     plus_notif: {
-      backgroundColor: '#D55161',
+      backgroundColor: '#dc322f',
     },
   },
 };

From fc838c5047309663c66e0621d554bf70b67343aa Mon Sep 17 00:00:00 2001
From: RekkyRek <haslun16@edu.vilehlmina.se>
Date: Tue, 2 Jan 2018 22:46:06 +0100
Subject: [PATCH 54/63] Added monokai

---
 app/src/js/consts/types.js | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/app/src/js/consts/types.js b/app/src/js/consts/types.js
index 948decfb..97633031 100644
--- a/app/src/js/consts/types.js
+++ b/app/src/js/consts/types.js
@@ -161,6 +161,29 @@ export const THEMES = {
       backgroundColor: '#dc322f',
     },
   },
+  MONOKAI: {
+    name: 'Monokai',
+    id: 'monokai',
+    backgroundColor: '#22231e',
+    item_card: {
+      backgroundColor: '#272822',
+      color: '#fdf6e3',
+    },
+    comment_card: {
+      backgroundColor: '#586e75',
+      color: '#fdf6e3',
+    },
+    column: {
+      backgroundColor: '#54556E',
+      width: '450',
+    },
+    user_badge: {
+      details_back: '#54556E',
+    },
+    plus_notif: {
+      backgroundColor: '#f92672',
+    },
+  },
 };
 
 export const STATE = {

From 35203b4af589b753e579bc8a00f000901eb4606e Mon Sep 17 00:00:00 2001
From: RekkyRek <haslun16@edu.vilehlmina.se>
Date: Tue, 2 Jan 2018 22:46:49 +0100
Subject: [PATCH 55/63] Fixed vote button centering

---
 app/src/res/sass/modules/bottom_bar.sass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/res/sass/modules/bottom_bar.sass b/app/src/res/sass/modules/bottom_bar.sass
index 10b4be2f..0e1fc784 100644
--- a/app/src/res/sass/modules/bottom_bar.sass
+++ b/app/src/res/sass/modules/bottom_bar.sass
@@ -24,6 +24,7 @@
       position: relative
       .ud_icon
         z-index: 100
+        transform: translatey(-2px)
       &.disabled
         opacity: 0.5
         cursor: default

From ee92562479bfec7a52d019998d317e80fbd6157f Mon Sep 17 00:00:00 2001
From: RekkyRek <haslun16@edu.vilehlmina.se>
Date: Tue, 2 Jan 2018 22:48:20 +0100
Subject: [PATCH 56/63] Fixed plusplus button in sol. dark

---
 app/src/js/consts/types.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/js/consts/types.js b/app/src/js/consts/types.js
index 97633031..daadbaa0 100644
--- a/app/src/js/consts/types.js
+++ b/app/src/js/consts/types.js
@@ -158,7 +158,7 @@ export const THEMES = {
       details_back: '#54556E',
     },
     plus_notif: {
-      backgroundColor: '#dc322f',
+      backgroundColor: '#D55161',
     },
   },
   MONOKAI: {

From c852611c5c7f2714ed33a6abc448ed972d30e9e0 Mon Sep 17 00:00:00 2001
From: Tahnik Mustasin <tahnik@live.co.uk>
Date: Wed, 3 Jan 2018 12:33:56 +0600
Subject: [PATCH 57/63] Fixed webpack build

---
 package-lock.json      | 7 ++-----
 package.json           | 3 ++-
 webpack/prod.config.js | 6 +++++-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index bbc138a4..6ae9a5e7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5504,8 +5504,7 @@
         "jsbn": {
           "version": "0.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "json-schema": {
           "version": "0.2.3",
@@ -11260,8 +11259,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.6.1",
@@ -12669,7 +12667,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"
diff --git a/package.json b/package.json
index 91105c91..02217066 100644
--- a/package.json
+++ b/package.json
@@ -136,7 +136,8 @@
     "redux-thunk": "^2.2.0",
     "semver-compare": "^1.0.0",
     "showdown": "^1.8.6",
-    "twemoji": "^2.5.0"
+    "twemoji": "^2.5.0",
+    "webpack-sources": "^1.1.0"
   },
   "optionalDependencies": {
     "7zip-bin-mac": "^1.0.1",
diff --git a/webpack/prod.config.js b/webpack/prod.config.js
index 413a6136..b4940a39 100644
--- a/webpack/prod.config.js
+++ b/webpack/prod.config.js
@@ -7,7 +7,11 @@ const HtmlWebpackPlugin = require('html-webpack-plugin');
 
 module.exports = {
   context: path.join(__dirname, '../app'),
-  devtool: 'source-map',
+  /**
+   * There is a known problem with devtools in webpack right now.
+   * Will add it back once that is fixed.
+   */
+  // devtool: 'source-map',
   entry: {
     app: [
       './src/res/sass/main.sass',

From 7aa02559e712eb0819d4acff5ecfade718934766 Mon Sep 17 00:00:00 2001
From: Tahnik Mustasin <tahnik@live.co.uk>
Date: Wed, 3 Jan 2018 12:34:34 +0600
Subject: [PATCH 58/63] enabling caching again

---
 .travis.yml  | 12 ++++++------
 appveyor.yml |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 17c8c7fc..d9c440d4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,12 +15,12 @@ env:
     - ELECTRON_CACHE=$HOME/.cache/electron
     - ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder
 
-# cache:
-#   directories:
-#   - node_modules
-#   - $HOME/.cache/electron
-#   - $HOME/.cache/electron-builder
-#   - $HOME/.npm/_prebuilds
+cache:
+  directories:
+  - node_modules
+  - $HOME/.cache/electron
+  - $HOME/.cache/electron-builder
+  - $HOME/.npm/_prebuilds
 
 install:
 - npm i
diff --git a/appveyor.yml b/appveyor.yml
index c2becd78..a2e580a9 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,8 +1,8 @@
 os: unstable
 
 # cache yarn and node_modules folder for rebuilds
-# cache:
-#   - node_modules
+cache:
+  - node_modules
 
 # Do not build feature branch with open Pull Requests
 skip_branch_with_pr: true

From 644bdfb276e29c21607f2125d02e00bbff1c425b Mon Sep 17 00:00:00 2001
From: Tahnik Mustasin <tahnik@live.co.uk>
Date: Wed, 3 Jan 2018 12:47:43 +0600
Subject: [PATCH 59/63] Updated codeclimate

---
 .codeclimate.yml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/.codeclimate.yml b/.codeclimate.yml
index 8267ba77..03d52330 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -6,6 +6,25 @@ engines:
     enabled: true
     config:
       config: .eslintrc
+checks:
+  argument-count:
+    config:
+      threshold: 4
+  complex-logic:
+    config:
+      threshold: 6
+  file-lines:
+    config:
+      threshold: 500
+  method-complexity:
+    config:
+      threshold: 6
+  method-count:
+    config:
+      threshold: 20
+  method-lines:
+    config:
+      threshold: 50
 ratings:
   paths:
   - "**.js"

From 175bc18b85fc35ad153c1772448f19e660cf52ce Mon Sep 17 00:00:00 2001
From: Tahnik Mustasin <tahnik@live.co.uk>
Date: Wed, 3 Jan 2018 13:52:34 +0600
Subject: [PATCH 60/63] Fixed solarized

---
 app/src/js/consts/types.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/js/consts/types.js b/app/src/js/consts/types.js
index daadbaa0..aa049b0b 100644
--- a/app/src/js/consts/types.js
+++ b/app/src/js/consts/types.js
@@ -135,7 +135,7 @@ export const THEMES = {
       details_back: '#54556E',
     },
     plus_notif: {
-      backgroundColor: '#D55161',
+      backgroundColor: '#eee8d5',
     },
   },
   SOLARIZED_DARK: {
@@ -158,7 +158,7 @@ export const THEMES = {
       details_back: '#54556E',
     },
     plus_notif: {
-      backgroundColor: '#D55161',
+      backgroundColor: '#eee8d5',
     },
   },
   MONOKAI: {

From d0fcd96083f72aa7ff64b623a6d9d824867c571d Mon Sep 17 00:00:00 2001
From: Tahnik Mustasin <tahnik@live.co.uk>
Date: Wed, 3 Jan 2018 14:16:21 +0600
Subject: [PATCH 61/63] Fixed collab notifications

---
 app/src/js/components/item/item.js           |  3 ++-
 app/src/js/components/notifs/notif_bubble.js |  3 ++-
 app/src/js/components/notifs/notifs.js       |  2 ++
 app/src/js/components/settings/theme.js      |  1 -
 app/src/js/consts/default_states.js          |  2 +-
 app/src/js/consts/utils.js                   | 10 +++++-----
 6 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/app/src/js/components/item/item.js b/app/src/js/components/item/item.js
index 340ef4f6..a332551e 100644
--- a/app/src/js/components/item/item.js
+++ b/app/src/js/components/item/item.js
@@ -138,6 +138,7 @@ class Item extends Component {
     const {
       theme, vote, cardItem, auth, open, showToast,
     } = this.props;
+    const type = item.rant.rt === 2 ? ITEM.COLLAB.NAME : cardItem.type;
     return (
       <ItemCard
         modal
@@ -145,7 +146,7 @@ class Item extends Component {
         key={item.rant.id}
         theme={theme}
         vote={vote}
-        itemType={cardItem.type}
+        itemType={type}
         auth={auth}
         open={open}
         showToast={showToast}
diff --git a/app/src/js/components/notifs/notif_bubble.js b/app/src/js/components/notifs/notif_bubble.js
index 979efb07..96cf3bf4 100644
--- a/app/src/js/components/notifs/notif_bubble.js
+++ b/app/src/js/components/notifs/notif_bubble.js
@@ -29,7 +29,8 @@ class Notification extends Component {
     }
     const username = user ? user.name : 'Deleted user';
     const avatarBack = user ? user.avatar.b : '#FFF';
-    const notifText = getNotifText(notif.type, username);
+    const isCollab = notif.rt === 2;
+    const notifText = getNotifText(notif.type, username, isCollab);
     switch (notif.type) {
       case 'comment_mention':
         icon = 'ion-chatbubble-working';
diff --git a/app/src/js/components/notifs/notifs.js b/app/src/js/components/notifs/notifs.js
index 92a86c27..e9c830f0 100644
--- a/app/src/js/components/notifs/notifs.js
+++ b/app/src/js/components/notifs/notifs.js
@@ -43,10 +43,12 @@ class Notifs extends Component {
     const notifs = this.props.notifs;
     if (prevUnread < currentUnread) {
       const notif = notifs.items[0];
+      const isCollab = notif.rt === 2;
       const osNotif = {
         body: getNotifText(
           notif.type,
           notifs.username_map[notif.uid].name,
+          isCollab,
         ),
         id: notif.rant_id,
         content: notif,
diff --git a/app/src/js/components/settings/theme.js b/app/src/js/components/settings/theme.js
index cbbf1aae..25096ba3 100644
--- a/app/src/js/components/settings/theme.js
+++ b/app/src/js/components/settings/theme.js
@@ -62,7 +62,6 @@ class Theme extends Component {
         return;
       }
     }
-    console.log(themeVals);
     this.props.changeTheme(null, {
       name: 'Custom Theme',
       id: 'custom_theme',
diff --git a/app/src/js/consts/default_states.js b/app/src/js/consts/default_states.js
index 9ded4b7b..913febee 100644
--- a/app/src/js/consts/default_states.js
+++ b/app/src/js/consts/default_states.js
@@ -56,7 +56,7 @@ export default {
           quick_reply_enabled: {
             type: SETTINGS.TYPE.TOGGLE,
             text: 'Enable "Quick Reply" when someone @mentions',
-            value: true,
+            value: false,
           },
           content_vote: {
             type: SETTINGS.TYPE.TOGGLE,
diff --git a/app/src/js/consts/utils.js b/app/src/js/consts/utils.js
index b3dd8c3a..f48f264b 100644
--- a/app/src/js/consts/utils.js
+++ b/app/src/js/consts/utils.js
@@ -18,20 +18,20 @@ export const getUID = () => 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]
 // eslint-disable-next-line
 export const escapeRegExp = str => str.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&");
 
-export const getNotifText = (type, username) => {
+export const getNotifText = (type, username, isCollab = false) => {
   switch (type) {
     case NOTIF_TYPES.COMMENT.MENTION:
       return `${username} mentioned you in a comment.`;
     case NOTIF_TYPES.COMMENT.CONTENT:
-      return `${username} commented on your rant.`;
+      return `${username} commented on your ${isCollab ? 'collab' : 'rant'}.`;
     case NOTIF_TYPES.COMMENT.DISCUSS:
-      return 'New comments on a rant you follow.';
+      return `New comments on a ${isCollab ? 'collab' : 'rant'} you follow.`;
     case NOTIF_TYPES.COMMENT.VOTE:
       return `${username} +1'd your comment.`;
     case NOTIF_TYPES.RANT_SUB:
-      return `${username} posted a new rant`;
+      return `${username} posted a new ${isCollab ? 'collab' : 'rant'}.`;
     default:
-      return `${username} +1'd your rant.`;
+      return `${username} +1'd your ${isCollab ? 'collab' : 'rant'}.`;
   }
 };
 

From 7d2976177e7529ae064b103f778e33b33ba3cfab Mon Sep 17 00:00:00 2001
From: Tahnik Mustasin <tahnik@live.co.uk>
Date: Wed, 3 Jan 2018 15:04:18 +0600
Subject: [PATCH 62/63] Fixed some settings colors

---
 app/src/js/components/settings/button.js  |  5 ++++
 app/src/js/components/settings/general.js |  3 +++
 app/src/js/components/settings/slider.js  |  2 ++
 app/src/js/components/settings/toggle.js  |  2 ++
 app/src/res/sass/modules/common.sass      | 29 ++++++++++++-----------
 5 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/app/src/js/components/settings/button.js b/app/src/js/components/settings/button.js
index 3850c459..4bcb9ea8 100644
--- a/app/src/js/components/settings/button.js
+++ b/app/src/js/components/settings/button.js
@@ -8,6 +8,10 @@ const Button = props => (
       <button
         onClick={() => props.handleChange()}
         disabled={!props.setting.value}
+        style={{
+          backgroundColor: props.theme.backgroundColor,
+          color: props.theme.item_card.color,
+        }}
       >{props.setting.buttonText}
       </button>
     </div>
@@ -16,6 +20,7 @@ const Button = props => (
 
 Button.propTypes = {
   setting: PropTypes.object.isRequired,
+  theme: PropTypes.object.isRequired,
   handleChange: PropTypes.func.isRequired,
 };
 
diff --git a/app/src/js/components/settings/general.js b/app/src/js/components/settings/general.js
index 1df32cf4..e86e70f4 100644
--- a/app/src/js/components/settings/general.js
+++ b/app/src/js/components/settings/general.js
@@ -22,6 +22,7 @@ class General extends Component {
             handleChange={(value) => {
               this.handleChange(primaryKey, secondaryKey, value);
             }}
+            theme={this.props.theme}
           />
         );
       }
@@ -33,6 +34,7 @@ class General extends Component {
             handleChange={() => {
               this.handleChange(primaryKey, secondaryKey, !setting.value);
             }}
+            theme={this.props.theme}
           />
         );
       }
@@ -56,6 +58,7 @@ class General extends Component {
             handleChange={() => {
               this.handleChange(primaryKey, secondaryKey);
             }}
+            theme={this.props.theme}
           />
         );
       }
diff --git a/app/src/js/components/settings/slider.js b/app/src/js/components/settings/slider.js
index 21cacf12..0dcd16e5 100644
--- a/app/src/js/components/settings/slider.js
+++ b/app/src/js/components/settings/slider.js
@@ -22,6 +22,7 @@ class Slider extends Component {
             value={this.state.value}
             onChange={(e) => { this.setState({ value: e.target.value }); }}
             onMouseUp={() => this.props.handleChange(this.state.value)}
+            style={{ backgroundColor: this.props.theme.backgroundColor }}
           />
         </div>
       </div>
@@ -31,6 +32,7 @@ class Slider extends Component {
 
 Slider.propTypes = {
   setting: PropTypes.object.isRequired,
+  theme: PropTypes.object.isRequired,
   handleChange: PropTypes.func.isRequired,
 };
 
diff --git a/app/src/js/components/settings/toggle.js b/app/src/js/components/settings/toggle.js
index ac7cc0d9..de9924da 100644
--- a/app/src/js/components/settings/toggle.js
+++ b/app/src/js/components/settings/toggle.js
@@ -14,6 +14,7 @@ const Toggle = props => (
         />
         <span
           className="slider"
+          style={{ backgroundColor: props.theme.backgroundColor }}
         />
       </label>
     </div>
@@ -22,6 +23,7 @@ const Toggle = props => (
 
 Toggle.propTypes = {
   setting: PropTypes.object.isRequired,
+  theme: PropTypes.object.isRequired,
   handleChange: PropTypes.func.isRequired,
 };
 
diff --git a/app/src/res/sass/modules/common.sass b/app/src/res/sass/modules/common.sass
index 686054b0..47d0b175 100644
--- a/app/src/res/sass/modules/common.sass
+++ b/app/src/res/sass/modules/common.sass
@@ -132,36 +132,37 @@ $post_comment_height: 13rem
 .range_input
   -webkit-appearance: none
   width: 100%
+  height: 21px
   margin: 7px 0
   border: none
   position: relative
+  border-radius: 12px
   &:focus
     outline: none
-  &::-webkit-slider-runnable-track
-    width: 100%
-    padding: 0px 5px
-    height: 24px
-    cursor: pointer
-    box-shadow: 0px 0px 0px rgba(0, 0, 0, 0), 0px 0px 0px rgba(13, 13, 13, 0)
-    background: #c14857
-    border-radius: 12px
-    border: 0px solid rgba(0, 0, 0, 0)
+  // &::-webkit-slider-runnable-track
+  //   width: 100%
+  //   padding: 0px 5px
+  //   height: 24px
+  //   cursor: pointer
+  //   box-shadow: 0px 0px 0px rgba(0, 0, 0, 0), 0px 0px 0px rgba(13, 13, 13, 0)
+  //   background: #c14857
+  //   border-radius: 12px
+  //   border: 0px solid rgba(0, 0, 0, 0)
 
   &::-webkit-slider-thumb
     position: relative
-    top: 10px
+    top: 1px
     box-shadow: 0px 0px 0px rgba(0, 0, 0, 0), 0px 0px 0px rgba(13, 13, 13, 0)
     border: 0px solid rgba(0, 0, 0, 0)
     height: 18.2px
     width: 18.2px
-    border-radius: 18px
+    border-radius: 18.2px
     background: #ffffff
     cursor: pointer
     -webkit-appearance: none
-    margin-top: -7px
 
-  &:focus::-webkit-slider-runnable-track
-    background: #c14857
+  // &:focus::-webkit-slider-runnable-track
+  //   background: #c14857
 
 body
   padding: 0

From 5c86eea5621175571c6b2d3c3744da48c7ccf055 Mon Sep 17 00:00:00 2001
From: Tahnik Mustasin <tahnik@live.co.uk>
Date: Wed, 3 Jan 2018 15:16:51 +0600
Subject: [PATCH 63/63] Updated codeclimate

---
 .codeclimate.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.codeclimate.yml b/.codeclimate.yml
index 03d52330..fba60289 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -18,13 +18,13 @@ checks:
       threshold: 500
   method-complexity:
     config:
-      threshold: 6
+      threshold: 10
   method-count:
     config:
       threshold: 20
   method-lines:
     config:
-      threshold: 50
+      threshold: 200
 ratings:
   paths:
   - "**.js"