Nouveau look pour le site, via nouveau template

2019-12-20 20:59:35 +01:00
parent 8f375d6e1a
commit f0b96f298b
14 changed files with 888 additions and 162 deletions
--- a/templates/frontOffice/default2020/Gruntfile.js
+++ b/templates/frontOffice/default2020/Gruntfile.js
@@ -22,8 +22,8 @@ module.exports = function (grunt) {
                    paths: 'assets/src/css'
                },
                files: {
-                    'assets/src/css/thelia.css': 'assets/src/less/thelia.less',
-                    'assets/dist/css/thelia.min.css': 'assets/src/less/thelia.less'
+                    'assets/src/css/thelia.css': 'assets/src/less/thelia.less'
+                    // 'assets/dist/css/thelia.min.css': 'assets/src/less/thelia.less'
                }
            }
        },
@@ -194,7 +194,8 @@ module.exports = function (grunt) {
                tasks: ['less'],
                options: {
                    spawn: false,
-                    livereload: true
+                    livereload: true,
+                    forceWatchMethod: 'old'
                }
            },
            cssmin: {
--- a/templates/frontOffice/default2020/ajax/order-delivery-module-list.html
+++ b/templates/frontOffice/default2020/ajax/order-delivery-module-list.html
@@ -1,5 +1,5 @@
 {* Set the default translation domain, that will be used by {intl} when the 'd' parameter is not set *}
-{default_translation_domain domain='fo.default'}
+{default_translation_domain domain='fo.default2020'}

 {form name="thelia.order.delivery"}

--- a/templates/frontOffice/default2020/assets/dist/css/thelia.min.css
+++ b/templates/frontOffice/default2020/assets/dist/css/thelia.min.css
--- a/templates/frontOffice/default2020/assets/dist/img/218x146.png
+++ b/templates/frontOffice/default2020/assets/dist/img/218x146.png
--- a/templates/frontOffice/default2020/assets/dist/img/280x196.png
+++ b/templates/frontOffice/default2020/assets/dist/img/280x196.png
--- a/templates/frontOffice/default2020/assets/dist/img/logo.png
+++ b/templates/frontOffice/default2020/assets/dist/img/logo.png
--- a/templates/frontOffice/default2020/assets/src/css/thelia.css
+++ b/templates/frontOffice/default2020/assets/src/css/thelia.css
@@ -8758,6 +8758,10 @@ header .header .language-container .currency-switch .select {
  padding: 0;
  width: 19%;
 }
+#product #product-gallery #product-thumbnails ul > li .thumbnail.disabled {
+  opacity: 0.3;
+  filter: alpha(opacity=30);
+}
 #product #product-details .name {
  margin-top: 0;
 }
@@ -11009,3 +11013,104 @@ td.product .name > a:focus,
 .rev_slider_wrapper {
  margin-bottom: 15px !important;
 }
+/*  Nouveau menu supérieur  */
+#barre-superieure {
+  display: none;
+}
+header .header {
+  margin-top: 30px;
+}
+header .header-custom {
+  height: 1%;
+  min-width: 100%;
+  display: grid;
+  grid-gap: 0.5rem;
+  grid-template-areas: "logo content" "footer footer";
+  -ms-flex-align: center;
+      align-items: center;
+  justify-items: left;
+}
+@media screen and (max-width: 992px) {
+  header .header-custom {
+    margin-bottom: 20px;
+  }
+}
+@media screen and (min-width: 992px) {
+  header .header-custom {
+    margin-bottom: 0px;
+  }
+}
+header .logo-custom {
+  grid-area: logo;
+  height: 50px;
+  width: 250px;
+  padding-left: 15px;
+}
+header .secondary-custom {
+  grid-area: content;
+  height: 45px;
+  -ms-flex-line-pack: left;
+      align-content: left;
+}
+header .primary-custom {
+  grid-area: footer;
+  height: 25px;
+  width: 100%;
+}
+header .row {
+  background-color: #F29D39;
+}
+header nav.navbar {
+  min-height: 0px;
+  margin-bottom: 0px;
+  border: none;
+}
+header nav.navbar .container-fluid {
+  background-color: #F29D39;
+}
+header nav.navbar .container-fluid .navbar-collapse {
+  padding-left: 0;
+}
+header nav.navbar li {
+  margin-right: 10px;
+}
+header nav.navbar li.dropdown,
+header nav.navbar li.top-tab {
+  background-color: #303C6E;
+  border-top-left-radius: 12px;
+  border-top-right-radius: 12px;
+}
+header nav.navbar li.dropdown > a,
+header nav.navbar li.top-tab > a {
+  padding: 5px 10px;
+  color: white;
+}
+header a {
+  color: #303C6E;
+}
+/* navbar-secondary */
+.navbar li > a.login:before,
+.navbar li.cart-not-empty > a.cart:before {
+  color: #303C6E;
+}
+.dropdown > a:after {
+  color: #303C6E;
+}
+.navbar li.cart-not-empty > a.cart > .badge {
+  background-color: #303C6E;
+}
+.badge {
+  background-color: #303C6E;
+}
+.navbar li.cart-not-empty > a.cart {
+  color: #303C6E;
+}
+.footer-container .footer-info {
+  background-color: #F29D39;
+  color: #303C6E;
+  font-weight: bold;
+}
+.footer-container .footer-info a {
+  color: #303C6E;
+  font-weight: bold;
+}
--- a/templates/frontOffice/default2020/assets/src/img/logo.png
+++ b/templates/frontOffice/default2020/assets/src/img/logo.png
--- a/templates/frontOffice/default2020/assets/src/less/custom.less
+++ b/templates/frontOffice/default2020/assets/src/less/custom.less
@@ -1,4 +1,132 @@
+@couleur-onglets: #303C6E;
+@couleur-fond-banniere: #F29D39;
+@largeurLogo: 250px;
+@hauteur-ligne-1: 50px;
+@hauteur-ligne-2: 45px;
+

 .rev_slider_wrapper {
-    margin-bottom: 15px !important;
+  margin-bottom: 15px !important;
+}
+
+
+/*  Nouveau menu supérieur  */
+
+#barre-superieure {
+  display: none;
+}
+
+header {
+
+  .header {
+    margin-top: 30px;
+  }
+
+  .header-custom {
+    height: 1%;
+    min-width: 100%;
+    display: grid;
+    grid-gap: 0.5rem;
+    grid-template-areas: "logo content" "footer footer";
+    align-items: center;
+    justify-items: left;
+
+    @media screen and (max-width: @screen-md-min) {
+      margin-bottom: 20px;
+    }
+    @media screen and (min-width: @screen-md-min) {
+      margin-bottom: 0px;
+    }
+  }
+
+  .logo-custom {
+    grid-area: logo;
+    height: @hauteur-ligne-1;
+    width: @largeurLogo;
+    padding-left: 15px;
+  }
+
+  .secondary-custom {
+    grid-area: content;
+    height: @hauteur-ligne-2;
+    align-content: left;
+  }
+
+  .primary-custom {
+    grid-area: footer;
+    height: 25px;
+    width: 100%;
+  }
+
+  .row {
+    background-color: @couleur-fond-banniere;
+  }
+
+  nav.navbar {
+    min-height: 0px;
+    margin-bottom: 0px;
+    border: none;
+
+    .container-fluid {
+      background-color: @couleur-fond-banniere;
+
+      .navbar-collapse {
+        padding-left: 0;
+      }
+    }
+
+    li {
+      margin-right: 10px;
+    }
+
+    li.dropdown, li.top-tab {
+      background-color: @couleur-onglets;
+      border-top-left-radius: 12px;
+      border-top-right-radius: 12px;
+
+      > a {
+        padding: 5px 10px;
+        color: white;
+      }
+    }
+  }
+}
+
+header a {
+  color: @couleur-onglets;
+}
+
+/* navbar-secondary */
+.navbar li > a.login:before, .navbar li.cart-not-empty > a.cart:before {
+  color: @couleur-onglets;
+}
+
+.dropdown > a:after {
+  color: @couleur-onglets;
+}
+
+.navbar li.cart-not-empty>a.cart>.badge {
+  background-color: @couleur-onglets;
+}
+
+.badge {
+  background-color: @couleur-onglets;
+}
+
+.navbar li.cart-not-empty>a.cart {
+  color: @couleur-onglets;
+}
+
+// -------------------------- Fin Header ----------------
+
+// -------------------------- Footer --------------------
+.footer-container .footer-info {
+  background-color: @couleur-fond-banniere;
+  color: @couleur-onglets;
+  font-weight: bold;
+
+  a {
+    color: @couleur-onglets;
+    font-weight: bold;
+  }
 }
--- a/templates/frontOffice/default2020/includes/addedToCart.html
+++ b/templates/frontOffice/default2020/includes/addedToCart.html
@@ -1,7 +1,7 @@
 {* This page should not replace the current previous URL *}
 {set_previous_url ignore_current="1"}

-{default_translation_domain domain='fo.default'}
+{default_translation_domain domain='fo.default2020'}
 {loop type="product" name="add_product_to_cart" id={product attr="id"}}
 <div class="clearfix">
    <table>
--- a/templates/frontOffice/default2020/layout.tpl
+++ b/templates/frontOffice/default2020/layout.tpl
@@ -20,7 +20,7 @@ GNU General Public License : http://www.gnu.org/licenses/
 {* Declare assets directory, relative to template base directory *}
 {declare_assets directory='assets/dist'}
 {* Set the default translation domain, that will be used by {intl} when the 'd' parameter is not set *}
-{default_translation_domain domain='fo.default'}
+{default_translation_domain domain='fo.default2020'}

 {* -- Define some stuff for Smarty ------------------------------------------ *}
 {config_load file='variables.conf'}
@@ -37,11 +37,14 @@ GNU General Public License : http://www.gnu.org/licenses/
 <!--[if lt IE 7 ]><html class="no-js oldie ie6" lang="{$lang_code}"> <![endif]-->
 <!--[if IE 7 ]><html class="no-js oldie ie7" lang="{$lang_code}"> <![endif]-->
 <!--[if IE 8 ]><html class="no-js oldie ie8" lang="{$lang_code}"> <![endif]-->
-<!--[if (gte IE 9)|!(IE)]><!--><html lang="{$lang_code}" class="no-js"> <!--<![endif]-->
+<!--[if (gte IE 9)|!(IE)]><!-->
+<html lang="{$lang_code}" class="no-js"> <!--<![endif]-->
 <head>
    {hook name="main.head-top"}
    {* Test if javascript is enabled *}
-    <script>(function(H) { H.className=H.className.replace(/\bno-js\b/,'js') } )(document.documentElement);</script>
+    <script>(function (H) {
+            H.className = H.className.replace(/\bno-js\b/, 'js')
+        })(document.documentElement);</script>

    <meta charset="utf-8">

@@ -53,11 +56,12 @@ GNU General Public License : http://www.gnu.org/licenses/
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=device-width,initial-scale=1.0">
    {block name="meta"}
-        <meta name="description" content="{if $page_description}{$page_description}{else}{$store_description|strip|truncate:120}{/if}">
+        <meta name="description"
+              content="{if $page_description}{$page_description}{else}{$store_description|strip|truncate:120}{/if}">
    {/block}

    {stylesheets file='assets/dist/css/thelia.min.css'}
-        <link rel="stylesheet" href="{$asset_url}">
+        <link rel="stylesheet" href="{$asset_url}?v=1">
    {/stylesheets}
    {*
     If you want to generate the CSS assets on the fly, just replace the stylesheet inclusion above by the following.
@@ -79,12 +83,15 @@ GNU General Public License : http://www.gnu.org/licenses/

    {* Favicon *}
    <link rel="shortcut icon" type="image/x-icon" href="{image file='assets/dist/img/favicon.ico'}">
-    <link rel="icon" type="image/png" href="{image file='assets/dist/img/favicon.png'}" />
+    <link rel="icon" type="image/png" href="{image file='assets/dist/img/favicon.png'}"/>

    {* Feeds *}
-    <link rel="alternate" type="application/rss+xml" title="{intl l='All products'}" href="{url path="/feed/catalog/%lang" lang=$lang_locale}" />
-    <link rel="alternate" type="application/rss+xml" title="{intl l='All contents'}" href="{url path="/feed/content/%lang" lang=$lang_locale}" />
-    <link rel="alternate" type="application/rss+xml" title="{intl l='All brands'}"   href="{url path="/feed/brand/%lang" lang=$lang_locale}" />
+    <link rel="alternate" type="application/rss+xml" title="{intl l='All products'}"
+          href="{url path="/feed/catalog/%lang" lang=$lang_locale}"/>
+    <link rel="alternate" type="application/rss+xml" title="{intl l='All contents'}"
+          href="{url path="/feed/content/%lang" lang=$lang_locale}"/>
+    <link rel="alternate" type="application/rss+xml" title="{intl l='All brands'}"
+          href="{url path="/feed/brand/%lang" lang=$lang_locale}"/>
    {block name="feeds"}{/block}

    {* HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries *}
@@ -103,82 +110,86 @@ GNU General Public License : http://www.gnu.org/licenses/
    {hook name="main.head-bottom"}
 </head>
 <body class="{block name="body-class"}{/block}" itemscope itemtype="http://schema.org/WebPage">
-    {hook name="main.body-top"}
+{hook name="main.body-top"}

-    <!-- Accessibility -->
-    <a class="sr-only" href="#content">{intl l="Skip to content"}</a>
+<!-- Accessibility -->
+<a class="sr-only" href="#content">{intl l="Skip to content"}</a>

-    <div class="page" role="document">
+<div class="page" role="document">

-        <div class="header-container" itemscope itemtype="http://schema.org/WPHeader">
-            {hook name="main.header-top"}
-            <div class="navbar navbar-default navbar-secondary" itemscope itemtype="http://schema.org/SiteNavigationElement">
-                <div class="container">
+    <div class="header-container" itemscope itemtype="http://schema.org/WPHeader">

-                    <div class="navbar-header">
-                        <!-- .navbar-toggle is used as the toggle for collapsed navbar content -->
-                        <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".nav-secondary">
-                            <span class="sr-only">{intl l="Toggle navigation"}</span>
-                            <span class="icon-bar"></span>
-                            <span class="icon-bar"></span>
-                            <span class="icon-bar"></span>
-                        </button>
-                        <a class="navbar-brand visible-xs" href="{navigate to="index"}">{$store_name}</a>
-                    </div>
+        {hook name="main.header-top"}
+        <div class="navbar navbar-default navbar-secondary" itemscope
+             itemtype="http://schema.org/SiteNavigationElement" id="barre-superieure">
+            <div class="container">
+                <div class="navbar-header">
+                    <!-- .navbar-toggle is used as the toggle for collapsed navbar content -->
+                    <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".nav-secondary">
+                        <span class="sr-only">{intl l="Toggle navigation"}</span>
+                        <span class="icon-bar"></span>
+                        <span class="icon-bar"></span>
+                        <span class="icon-bar"></span>
+                    </button>
+                    <a class="navbar-brand visible-xs" href="{navigate to="index"}">{$store_name}</a>
+                </div>
+            </div>
+        </div>

+        <header class="header container" role="banner">
+            <div class="header-custom row">
+                <h1 class="logo-custom logo">
+                    <a href="{navigate to="index"}" title="{$store_name}">
+                        {$image = {image file='assets/dist/img/logo.png' failsafe=true}}
+                        {if $image == null}
+                            {$image = {image file='assets/dist/img/logo.gif' failsafe=true}}
+                        {/if}
+                        <img src="{$image}" alt="{$store_name}">
+                    </a>
+                </h1>
+                <div class="secondary-custom container-fluid navbar">
                    {ifhook rel="main.navbar-secondary"}
                        {* Place everything within .nav-collapse to hide it until above 768px *}
-                        <nav class="navbar-collapse collapse nav-secondary" role="navigation" aria-label="{intl l="Secondary Navigation"}">
+                        <nav class="navbar-collapse collapse nav-secondary" role="navigation"
+                             aria-label="{intl l="Secondary Navigation"}">
                            {hook name="main.navbar-secondary"}
                        </nav>
                    {/ifhook}
                </div>
-            </div>
-
-
-            <header class="container" role="banner">
-                <div class="header row">
-                    <h1 class="logo container hidden-xs">
-                        <a href="{navigate to="index"}" title="{$store_name}">
-                            {$image = {image file='assets/dist/img/logo.png' failsafe=true}}
-                            {if $image == null}
-                                {$image = {image file='assets/dist/img/logo.gif' failsafe=true}}
-                            {/if}
-                            <img src="{$image}" alt="{$store_name}">
-                        </a>
-                    </h1>
+                <div class="primary-custom">
                    {hook name="main.navbar-primary"}
                </div>
-            </header><!-- /.header -->
+            </div>
+        </header><!-- /.header -->

-            {hook name="main.header-bottom"}
-        </div><!-- /.header-container -->
+        {hook name="main.header-bottom"}
+    </div><!-- /.header-container -->

-        <main class="main-container" role="main">
-            <div class="container">
-                {hook name="main.content-top"}
-                {block name="breadcrumb"}{include file="misc/breadcrumb.tpl"}{/block}
-                <div id="content">{block name="main-content"}{/block}</div>
-                {hook name="main.content-bottom"}
-            </div><!-- /.container -->
-        </main><!-- /.main-container -->
+    <main class="main-container" role="main">
+        <div class="container">
+            {hook name="main.content-top"}
+            {block name="breadcrumb"}{include file="misc/breadcrumb.tpl"}{/block}
+            <div id="content">{block name="main-content"}{/block}</div>
+            {hook name="main.content-bottom"}
+        </div><!-- /.container -->
+    </main><!-- /.main-container -->

-        <section class="footer-container" itemscope itemtype="http://schema.org/WPFooter">
+    <section class="footer-container" itemscope itemtype="http://schema.org/WPFooter">

-            {ifhook rel="main.footer-top"}
-                <section class="footer-block">
-                    <div class="container">
-                        <div class="blocks row">
-                            {hook name="main.footer-top"}
-                        </div>
+        {ifhook rel="main.footer-top"}
+            <section class="footer-block">
+                <div class="container">
+                    <div class="blocks row">
+                        {hook name="main.footer-top"}
                    </div>
-                </section>
-            {/ifhook}
-<br>
+                </div>
+            </section>
+        {/ifhook}
+        <br>

-<!-- DEBUT CHOIX PAR COULEURS SUR PAGE D'ACCUEIL-->
+        <!-- DEBUT CHOIX PAR COULEURS SUR PAGE D'ACCUEIL-->

-<!--<div class="container">
+        <!--<div class="container">
 <div class="row">
  <div class="col-md-4" style="padding:0px">

@@ -255,32 +266,32 @@ GNU General Public License : http://www.gnu.org/licenses/
                                        {/loop}
                                    {/if}
                                    <li><a href="{url path="/contact"}">{intl l="Contact Us"}</a></li>
-                                </ul>
-                            </nav>
-                            <section class="copyright col-lg-3">{intl l="Copyright"} &copy; <time datetime="{'Y-m-d'|date}">{'Y'|date}</time> <a href="http://thelia.net" rel="external">Thelia</a></section>
-                        </div>
-                    </div>
-                </footer><!-- /.footer-info -->
-            {/elsehook}
+</ul>
+</nav>
+<section class="copyright col-lg-3">{intl l="Copyright"} &copy; <time datetime="{'Y-m-d'|date}">{'Y'|date}</time> <a href="http://thelia.net" rel="external">Thelia</a></section>
+</div>
+</div>
+</footer><!-- /.footer-info -->
+{/elsehook}

-        </section><!-- /.footer-container -->
+</section><!-- /.footer-container -->

-    </div><!-- /.page -->
+</div><!-- /.page -->

-    {block name="before-javascript-include"}{/block}
-    <!-- JavaScript -->
+{block name="before-javascript-include"}{/block}
+<!-- JavaScript -->

-    <!-- Jquery -->
-    <!--[if lt IE 9]><script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script> <![endif]-->
-    <!--[if (gte IE 9)|!(IE)]><!--><script src="//ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script><!--<![endif]-->
-    {javascripts file="assets/dist/js/vendors/jquery.min.js"}
-        <script>window.jQuery || document.write('<script src="{$asset_url}"><\/script>');</script>
-    {/javascripts}
+<!-- Jquery -->
+<!--[if lt IE 9]><script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script> <![endif]-->
+<!--[if (gte IE 9)|!(IE)]><!--><script src="//ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script><!--<![endif]-->
+{javascripts file="assets/dist/js/vendors/jquery.min.js"}
+<script>window.jQuery || document.write('<script src="{$asset_url}"><\/script>');</script>
+{/javascripts}

-    <script src="//ajax.aspnetcdn.com/ajax/jquery.validate/1.13.1/jquery.validate.min.js"></script>
-    {* do no try to load messages_en, as this file does not exists *}
-    {if $lang_code != 'en'}
-        <script src="//ajax.aspnetcdn.com/ajax/jquery.validate/1.13.1/localization/messages_{$lang_code}.js"></script>
+<script src="//ajax.aspnetcdn.com/ajax/jquery.validate/1.13.1/jquery.validate.min.js"></script>
+{* do no try to load messages_en, as this file does not exists *}
+{if $lang_code != 'en'}
+<script src="//ajax.aspnetcdn.com/ajax/jquery.validate/1.13.1/localization/messages_{$lang_code}.js"></script>
    {/if}

    <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"></script>
@@ -308,6 +319,7 @@ GNU General Public License : http://www.gnu.org/licenses/
    <script src="{javascript file='assets/dist/js/thelia.min.js'}?v=1"></script>

    {hook name="main.body-bottom"}
+
 </body>


--- a/templates/frontOffice/default2020/layout_prod.tpl
+++ b/templates/frontOffice/default2020/layout_prod.tpl
@@ -0,0 +1,315 @@
+<!doctype html>
+<!--
+ ______   __  __     ______     __         __     ______
+/\__  _\ /\ \_\ \   /\  ___\   /\ \       /\ \   /\  __ \
+\/_/\ \/ \ \  __ \  \ \  __\   \ \ \____  \ \ \  \ \  __ \
+   \ \_\  \ \_\ \_\  \ \_____\  \ \_____\  \ \_\  \ \_\ \_\
+    \/_/   \/_/\/_/   \/_____/   \/_____/   \/_/   \/_/\/_/
+
+
+Copyright (c) OpenStudio
+email : info@thelia.net
+web : http://www.thelia.net
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3 of the
+GNU General Public License : http://www.gnu.org/licenses/
+-->
+
+{* Declare assets directory, relative to template base directory *}
+{declare_assets directory='assets/dist'}
+{* Set the default translation domain, that will be used by {intl} when the 'd' parameter is not set *}
+{default_translation_domain domain='fo.default2020'}
+
+{* -- Define some stuff for Smarty ------------------------------------------ *}
+{config_load file='variables.conf'}
+{block name="init"}{/block}
+{block name="no-return-functions"}{/block}
+{assign var="store_name" value={config key="store_name"}}
+{assign var="store_description" value={config key="store_description"}}
+{assign var="lang_code" value={lang attr="code"}}
+{assign var="lang_locale" value={lang attr="locale"}}
+{if not $store_name}{assign var="store_name" value={intl l='Thelia V2'}}{/if}
+{if not $store_description}{assign var="store_description" value={$store_name}}{/if}
+
+{* paulirish.com/2008/conditional-stylesheets-vs-css-hacks-answer-neither *}
+<!--[if lt IE 7 ]><html class="no-js oldie ie6" lang="{$lang_code}"> <![endif]-->
+<!--[if IE 7 ]><html class="no-js oldie ie7" lang="{$lang_code}"> <![endif]-->
+<!--[if IE 8 ]><html class="no-js oldie ie8" lang="{$lang_code}"> <![endif]-->
+<!--[if (gte IE 9)|!(IE)]><!--><html lang="{$lang_code}" class="no-js"> <!--<![endif]-->
+<head>
+    {hook name="main.head-top"}
+    {* Test if javascript is enabled *}
+    <script>(function(H) { H.className=H.className.replace(/\bno-js\b/,'js') } )(document.documentElement);</script>
+
+    <meta charset="utf-8">
+
+    {* Page Title *}
+    <title>{block name="page-title"}{strip}{if $page_title}{$page_title}{elseif $breadcrumbs}{foreach from=$breadcrumbs|array_reverse item=breadcrumb}{$breadcrumb.title|unescape} - {/foreach}{$store_name}{else}{$store_name}{/if}{/strip}{/block}</title>
+
+    {* Meta Tags *}
+    <meta name="generator" content="{intl l='Thelia V2'}">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width,initial-scale=1.0">
+    {block name="meta"}
+        <meta name="description" content="{if $page_description}{$page_description}{else}{$store_description|strip|truncate:120}{/if}">
+    {/block}
+
+    {stylesheets file='assets/dist/css/thelia.min.css'}
+        <link rel="stylesheet" href="{$asset_url}">
+    {/stylesheets}
+    {*
+     If you want to generate the CSS assets on the fly, just replace the stylesheet inclusion above by the following.
+     Then, in your back-office, go to Configuration -> System Variables and set process_assets to 1.
+     Now, when you're accessing the front office in developpement mode (index_dev.php)  the CSS is recompiled when a
+     change in the source files is detected.
+
+     See http://doc.thelia.net/en/documentation/templates/assets.html#activate-automatic-assets-generation for details.
+
+    {stylesheets file='assets/src/less/thelia.less' filters='less'}
+        <link rel="stylesheet" href="{$asset_url}">
+    {/stylesheets}
+
+    *}
+
+    {hook name="main.stylesheet"}
+
+    {block name="stylesheet"}{/block}
+
+    {* Favicon *}
+    <link rel="shortcut icon" type="image/x-icon" href="{image file='assets/dist/img/favicon.ico'}">
+    <link rel="icon" type="image/png" href="{image file='assets/dist/img/favicon.png'}" />
+
+    {* Feeds *}
+    <link rel="alternate" type="application/rss+xml" title="{intl l='All products'}" href="{url path="/feed/catalog/%lang" lang=$lang_locale}" />
+    <link rel="alternate" type="application/rss+xml" title="{intl l='All contents'}" href="{url path="/feed/content/%lang" lang=$lang_locale}" />
+    <link rel="alternate" type="application/rss+xml" title="{intl l='All brands'}"   href="{url path="/feed/brand/%lang" lang=$lang_locale}" />
+    {block name="feeds"}{/block}
+
+    {* HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries *}
+    <!--[if lt IE 9]>
+    <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv.js"></script>
+    {javascripts file="assets/dist/js/vendors/html5shiv.min.js"}
+        <script>window.html5 || document.write('<script src="{$asset_url}"><\/script>');</script>
+    {/javascripts}
+
+    <script src="//cdnjs.cloudflare.com/ajax/libs/respond.js/1.4.2/respond.js"></script>
+    {javascripts file="assets/dist/js/vendors/respond.min.js"}
+        <script>window.respond || document.write('<script src="{$asset_url}"><\/script>');</script>
+    {/javascripts}
+    <![endif]-->
+
+    {hook name="main.head-bottom"}
+</head>
+<body class="{block name="body-class"}{/block}" itemscope itemtype="http://schema.org/WebPage">
+    {hook name="main.body-top"}
+
+    <!-- Accessibility -->
+    <a class="sr-only" href="#content">{intl l="Skip to content"}</a>
+
+    <div class="page" role="document">
+
+        <div class="header-container" itemscope itemtype="http://schema.org/WPHeader">
+            {hook name="main.header-top"}
+            <div class="navbar navbar-default navbar-secondary" itemscope itemtype="http://schema.org/SiteNavigationElement">
+                <div class="container">
+
+                    <div class="navbar-header">
+                        <!-- .navbar-toggle is used as the toggle for collapsed navbar content -->
+                        <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".nav-secondary">
+                            <span class="sr-only">{intl l="Toggle navigation"}</span>
+                            <span class="icon-bar"></span>
+                            <span class="icon-bar"></span>
+                            <span class="icon-bar"></span>
+                        </button>
+                        <a class="navbar-brand visible-xs" href="{navigate to="index"}">{$store_name}</a>
+                    </div>
+
+                    {ifhook rel="main.navbar-secondary"}
+                        {* Place everything within .nav-collapse to hide it until above 768px *}
+                        <nav class="navbar-collapse collapse nav-secondary" role="navigation" aria-label="{intl l="Secondary Navigation"}">
+                            {hook name="main.navbar-secondary"}
+                        </nav>
+                    {/ifhook}
+                </div>
+            </div>
+
+
+            <header class="container" role="banner">
+                <div class="header row">
+                    <h1 class="logo container hidden-xs">
+                        <a href="{navigate to="index"}" title="{$store_name}">
+                            {$image = {image file='assets/dist/img/logo.png' failsafe=true}}
+                            {if $image == null}
+                                {$image = {image file='assets/dist/img/logo.gif' failsafe=true}}
+                            {/if}
+                            <img src="{$image}" alt="{$store_name}">
+                        </a>
+                    </h1>
+                    {hook name="main.navbar-primary"}
+                </div>
+            </header><!-- /.header -->
+
+            {hook name="main.header-bottom"}
+        </div><!-- /.header-container -->
+
+        <main class="main-container" role="main">
+            <div class="container">
+                {hook name="main.content-top"}
+                {block name="breadcrumb"}{include file="misc/breadcrumb.tpl"}{/block}
+                <div id="content">{block name="main-content"}{/block}</div>
+                {hook name="main.content-bottom"}
+            </div><!-- /.container -->
+        </main><!-- /.main-container -->
+
+        <section class="footer-container" itemscope itemtype="http://schema.org/WPFooter">
+
+            {ifhook rel="main.footer-top"}
+                <section class="footer-block">
+                    <div class="container">
+                        <div class="blocks row">
+                            {hook name="main.footer-top"}
+                        </div>
+                    </div>
+                </section>
+            {/ifhook}
+<br>
+
+<!-- DEBUT CHOIX PAR COULEURS SUR PAGE D'ACCUEIL-->
+
+<!--<div class="container">
+<div class="row">
+  <div class="col-md-4" style="padding:0px">
+
+        {loop type="category" name="category.navigation" parent="188"}
+          <div class="col-xs-3" style="text-align:center">
+						<a href="{$URL}">
+                        {loop type="image" name="category.thumbnail" source="category" source_id="{$ID}"}
+                        <img src="{$IMAGE_URL}" alt="{$TITLE}" width="60px" border="0"/>
+                        {/loop}
+                        <br><font size= "1" color="#333333">{$TITLE}</font></a>
+                        </div>
+
+                    {if {$LOOP_COUNT} == 4}
+                    </div><div class="col-md-4" style="padding:0px">
+                    {/if}
+                     {if {$LOOP_COUNT} == 8}
+                     </div><div class="col-md-4" style="padding:0px">
+                    {/if}
+
+         {/loop}
+                   </div>
+         </div>
+
+    </div><!-- /.container -->
+
+<!-- FIN CHOIX PAR COULEURS SUR PAGE D'ACCUEIL-->
+
+
+            {ifhook rel="main.footer-body"}
+                <section class="footer-block">
+                    <div class="container">
+                        <div class="blocks row">
+                            {hookblock name="main.footer-body"  fields="id,class,title,content"}
+                            {forhook rel="main.footer-body"}
+                                <div class="col col-sm-3">
+                                    <section {if $id} id="{$id}"{/if} class="block {if $class} block-{$class}{/if}">
+                                        <div class="block-heading"><h3 class="block-title">{$title}</h3></div>
+                                        <div class="block-content">
+                                            {$content nofilter}
+                                        </div>
+                                    </section>
+                                </div>
+                            {/forhook}
+                            {/hookblock}
+                        </div>
+                    </div>
+                </section>
+            {/ifhook}
+
+            {ifhook rel="main.footer-bottom"}
+                <footer class="footer-info" role="contentinfo">
+                    <div class="container">
+                        <div class="info row">
+                            <div class="col-lg-9">
+                                {hook name="main.footer-bottom"}
+                            </div>
+                            <div class="col-lg-3">
+                                <section class="copyright">{intl l="Copyright"} &copy; <time datetime="{'Y-m-d'|date}">{'Y'|date}</time> <a href="http://thelia.net" rel="external">Thelia</a></section>
+                            </div>
+                        </div>
+                    </div>
+                </footer>
+            {/ifhook}
+            {elsehook rel="main.footer-bottom"}
+                <footer class="footer-info" role="contentinfo">
+                    <div class="container">
+                        <div class="info row">
+                            <nav class="nav-footer col-lg-9" role="navigation">
+                                <ul class="list-unstyled list-inline">
+                                    {$folder_information={config key="information_folder_id"}}
+                                    {if $folder_information}
+                                        {loop name="footer_links" type="content" folder=$folder_information }
+                                            <li><a href="{$URL nofilter}">{$TITLE}</a></li>
+                                        {/loop}
+                                    {/if}
+                                    <li><a href="{url path="/contact"}">{intl l="Contact Us"}</a></li>
+                                </ul>
+                            </nav>
+                            <section class="copyright col-lg-3">{intl l="Copyright"} &copy; <time datetime="{'Y-m-d'|date}">{'Y'|date}</time> <a href="http://thelia.net" rel="external">Thelia</a></section>
+                        </div>
+                    </div>
+                </footer><!-- /.footer-info -->
+            {/elsehook}
+
+        </section><!-- /.footer-container -->
+
+    </div><!-- /.page -->
+
+    {block name="before-javascript-include"}{/block}
+    <!-- JavaScript -->
+
+    <!-- Jquery -->
+    <!--[if lt IE 9]><script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script> <![endif]-->
+    <!--[if (gte IE 9)|!(IE)]><!--><script src="//ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script><!--<![endif]-->
+    {javascripts file="assets/dist/js/vendors/jquery.min.js"}
+        <script>window.jQuery || document.write('<script src="{$asset_url}"><\/script>');</script>
+    {/javascripts}
+
+    <script src="//ajax.aspnetcdn.com/ajax/jquery.validate/1.13.1/jquery.validate.min.js"></script>
+    {* do no try to load messages_en, as this file does not exists *}
+    {if $lang_code != 'en'}
+        <script src="//ajax.aspnetcdn.com/ajax/jquery.validate/1.13.1/localization/messages_{$lang_code}.js"></script>
+    {/if}
+
+    <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"></script>
+    {javascripts file="assets/dist/js/vendors/bootstrap.min.js"}
+        <script>if(typeof($.fn.modal) === 'undefined') { document.write('<script src="{$asset_url}"><\/script>'); }</script>
+    {/javascripts}
+    {javascripts file="assets/dist/js/vendors/bootbox.js"}
+        <script src="{$asset_url}"></script>
+    {/javascripts}
+
+    {hook name="main.after-javascript-include"}
+
+    {block name="after-javascript-include"}{/block}
+
+    {hook name="main.javascript-initialization"}
+    <script>
+       // fix path for addCartMessage
+       // if you use '/' in your URL rewriting, the cart message is not displayed
+       // addCartMessageUrl is used in thelia.js to update the mini-cart content
+       var addCartMessageUrl = "{url path='ajax/addCartMessage'}";
+    </script>
+    {block name="javascript-initialization"}{/block}
+
+    <!-- Custom scripts -->
+    <script src="{javascript file='assets/dist/js/thelia.min.js'}?v=1"></script>
+
+    {hook name="main.body-bottom"}
+</body>
+
+
+
+</html>
--- a/templates/frontOffice/default2020/modules/HookCustomer/main-navbar-secondary.html
+++ b/templates/frontOffice/default2020/modules/HookCustomer/main-navbar-secondary.html
@@ -0,0 +1,43 @@
+<ul class="nav navbar-nav navbar-customer navbar-right">
+    {loop type="auth" name="customer_info_block" role="CUSTOMER"}
+    <li><a href="{url path="/logout"}" class="logout">{intl l="Log out!" d="hookcustomer.fo.default"}</a></li>
+    <li><a href="{url path="/account"}" class="account">{intl l="My Account" d="hookcustomer.fo.default"}</a></li>
+    {/loop}
+    {elseloop rel="customer_info_block"}
+    <!-- <li><a href="{url path="/register"}" class="register">{intl l="Register!" d="hookcustomer.fo.default"}</a></li> //-->
+    <li class="dropdown">
+        <a href="{url path="/login"}" class="login dropdown-toggle">{intl l="Log In!" d="hookcustomer.fo.default"}</a>
+        <div class="dropdown-menu">
+            {form name="thelia.front.customer.login"}
+            <form id="form-login-mini" action="{url path="/login"}" method="post" {form_enctype}>
+            {form_hidden_fields}
+            {form_field field="success_url"}
+            <input type="hidden" name="{$name}" value="{navigate to="current"}">
+            {/form_field}
+            {form_field field="email"}
+            <div class="form-group group-email">
+                <label for="{$label_attr.for}-mini">{intl l="Email address" d="hookcustomer.fo.default"}</label>
+                <input type="email" name="{$name}" id="{$label_attr.for}-mini" class="form-control input-sm" maxlength="255" aria-required="true" required>
+            </div>
+            {/form_field}
+            {form_field field="password"}
+            <div class="form-group group-password">
+                <label for="{$label_attr.for}-mini">{intl l="Password" d="hookcustomer.fo.default"}</label>
+                <input type="password" name="{$name}" id="{$label_attr.for}-mini" class="form-control input-sm" maxlength="255" aria-required="true" required>
+            </div>
+            {/form_field}
+            {form_field field="account"}
+            <input type="hidden" name="{$name}" value="1">
+            {/form_field}
+            <div class="form-group group-btn">
+                <button type="submit" class="btn btn-login-mini btn-sm btn-primary"><i class="fa fa-sign-in"></i> {intl l="Sign In" d="hookcustomer.fo.default"}</button>
+                <!-- <a href="{url path="/register"}" class="btn btn-register-mini btn-default btn-sm"><i class="fa fa-user-plus"></i> {intl l="Register" d="hookcustomer.fo.default"}</a> //-->
+            </div>
+
+            <a href="{url path="/password"}" class="mini-forgot-password">{intl l="Forgot your Password?" d="hookcustomer.fo.default"}</a>
+            </form>
+            {/form}
+        </div>
+    </li>
+    {/elseloop}
+</ul>
--- a/templates/frontOffice/default2020/package-lock.json
+++ b/templates/frontOffice/default2020/package-lock.json
@@ -46,6 +46,7 @@
      "version": "0.1.1",
      "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz",
      "integrity": "sha1-KWLPVOyXksSFEKPetSRDaGHvclE=",
+      "optional": true,
      "requires": {
        "ansi-wrap": "0.1.0"
      }
@@ -63,12 +64,14 @@
    "ansi-wrap": {
      "version": "0.1.0",
      "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz",
-      "integrity": "sha1-qCJQ3bABXponyoLoLqYDu/pF768="
+      "integrity": "sha1-qCJQ3bABXponyoLoLqYDu/pF768=",
+      "optional": true
    },
    "archive-type": {
      "version": "3.2.0",
      "resolved": "https://registry.npmjs.org/archive-type/-/archive-type-3.2.0.tgz",
      "integrity": "sha1-nNnABpV+vpX62tW9YJiUKoE3N/Y=",
+      "optional": true,
      "requires": {
        "file-type": "^3.1.0"
      }
@@ -218,7 +221,8 @@
    "beeper": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz",
-      "integrity": "sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak="
+      "integrity": "sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak=",
+      "optional": true
    },
    "bin-build": {
      "version": "2.2.0",
@@ -291,6 +295,7 @@
      "version": "1.2.2",
      "resolved": "http://registry.npmjs.org/bl/-/bl-1.2.2.tgz",
      "integrity": "sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==",
+      "optional": true,
      "requires": {
        "readable-stream": "^2.3.5",
        "safe-buffer": "^5.1.1"
@@ -300,6 +305,7 @@
      "version": "2.10.1",
      "resolved": "http://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
      "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
+      "optional": true,
      "requires": {
        "hoek": "2.x.x"
      }
@@ -343,6 +349,7 @@
      "version": "1.2.0",
      "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz",
      "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==",
+      "optional": true,
      "requires": {
        "buffer-alloc-unsafe": "^1.1.0",
        "buffer-fill": "^1.0.0"
@@ -351,17 +358,20 @@
    "buffer-alloc-unsafe": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz",
-      "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg=="
+      "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==",
+      "optional": true
    },
    "buffer-crc32": {
      "version": "0.2.13",
      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI="
+      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
+      "optional": true
    },
    "buffer-fill": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz",
-      "integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw="
+      "integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw=",
+      "optional": true
    },
    "buffer-from": {
      "version": "1.1.1",
@@ -406,7 +416,8 @@
    "capture-stack-trace": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz",
-      "integrity": "sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw=="
+      "integrity": "sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw==",
+      "optional": true
    },
    "caseless": {
      "version": "0.12.0",
@@ -418,6 +429,7 @@
      "version": "1.2.0",
      "resolved": "https://registry.npmjs.org/caw/-/caw-1.2.0.tgz",
      "integrity": "sha1-/7Im/n78VHKI3GLuPpcHPCEtEDQ=",
+      "optional": true,
      "requires": {
        "get-proxy": "^1.0.1",
        "is-obj": "^1.0.0",
@@ -428,7 +440,8 @@
        "object-assign": {
          "version": "3.0.0",
          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
-          "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I="
+          "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=",
+          "optional": true
        }
      }
    },
@@ -465,7 +478,8 @@
        "ansi-regex": {
          "version": "2.1.1",
          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+          "optional": true
        },
        "chalk": {
          "version": "1.1.3",
@@ -567,7 +581,8 @@
    "co": {
      "version": "3.1.0",
      "resolved": "https://registry.npmjs.org/co/-/co-3.1.0.tgz",
-      "integrity": "sha1-TqVOpaCJOBUxheFSEMaNkJK8G3g="
+      "integrity": "sha1-TqVOpaCJOBUxheFSEMaNkJK8G3g=",
+      "optional": true
    },
    "coa": {
      "version": "1.0.4",
@@ -586,7 +601,8 @@
    "color-support": {
      "version": "1.1.3",
      "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
-      "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg=="
+      "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
+      "optional": true
    },
    "colors": {
      "version": "0.6.2",
@@ -597,6 +613,7 @@
      "version": "1.0.7",
      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz",
      "integrity": "sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==",
+      "optional": true,
      "requires": {
        "delayed-stream": "~1.0.0"
      }
@@ -656,6 +673,7 @@
      "version": "3.0.2",
      "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz",
      "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=",
+      "optional": true,
      "requires": {
        "capture-stack-trace": "^1.0.0"
      }
@@ -767,6 +785,7 @@
      "version": "3.0.0",
      "resolved": "https://registry.npmjs.org/decompress/-/decompress-3.0.0.tgz",
      "integrity": "sha1-rx3VDQbjv8QyRh033hGzjA2ZG+0=",
+      "optional": true,
      "requires": {
        "buffer-to-vinyl": "^1.0.0",
        "concat-stream": "^1.4.6",
@@ -783,6 +802,7 @@
      "version": "3.1.0",
      "resolved": "https://registry.npmjs.org/decompress-tar/-/decompress-tar-3.1.0.tgz",
      "integrity": "sha1-IXx4n5uURQ76rcXF5TeXj8MzxGY=",
+      "optional": true,
      "requires": {
        "is-tar": "^1.0.0",
        "object-assign": "^2.0.0",
@@ -795,17 +815,20 @@
        "clone": {
          "version": "0.2.0",
          "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
-          "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8="
+          "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=",
+          "optional": true
        },
        "object-assign": {
          "version": "2.1.1",
          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz",
-          "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo="
+          "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo=",
+          "optional": true
        },
        "vinyl": {
          "version": "0.4.6",
          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
          "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
+          "optional": true,
          "requires": {
            "clone": "^0.2.0",
            "clone-stats": "^0.0.1"
@@ -817,6 +840,7 @@
      "version": "3.1.0",
      "resolved": "https://registry.npmjs.org/decompress-tarbz2/-/decompress-tarbz2-3.1.0.tgz",
      "integrity": "sha1-iyOTVoE1X58YnYclag+L3ZbZZm0=",
+      "optional": true,
      "requires": {
        "is-bzip2": "^1.0.0",
        "object-assign": "^2.0.0",
@@ -830,17 +854,20 @@
        "clone": {
          "version": "0.2.0",
          "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
-          "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8="
+          "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=",
+          "optional": true
        },
        "object-assign": {
          "version": "2.1.1",
          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz",
-          "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo="
+          "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo=",
+          "optional": true
        },
        "vinyl": {
          "version": "0.4.6",
          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
          "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
+          "optional": true,
          "requires": {
            "clone": "^0.2.0",
            "clone-stats": "^0.0.1"
@@ -852,6 +879,7 @@
      "version": "3.1.0",
      "resolved": "https://registry.npmjs.org/decompress-targz/-/decompress-targz-3.1.0.tgz",
      "integrity": "sha1-ssE9+YFmJomRtxXWRH9kLpaW9aA=",
+      "optional": true,
      "requires": {
        "is-gzip": "^1.0.0",
        "object-assign": "^2.0.0",
@@ -864,17 +892,20 @@
        "clone": {
          "version": "0.2.0",
          "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
-          "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8="
+          "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=",
+          "optional": true
        },
        "object-assign": {
          "version": "2.1.1",
          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz",
-          "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo="
+          "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo=",
+          "optional": true
        },
        "vinyl": {
          "version": "0.4.6",
          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
          "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
+          "optional": true,
          "requires": {
            "clone": "^0.2.0",
            "clone-stats": "^0.0.1"
@@ -886,6 +917,7 @@
      "version": "3.4.0",
      "resolved": "https://registry.npmjs.org/decompress-unzip/-/decompress-unzip-3.4.0.tgz",
      "integrity": "sha1-YUdbQVIGa74/7hL51inRX+ZHjus=",
+      "optional": true,
      "requires": {
        "is-zip": "^1.0.0",
        "read-all-stream": "^3.0.0",
@@ -900,6 +932,7 @@
          "version": "2.0.5",
          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
          "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+          "optional": true,
          "requires": {
            "readable-stream": "~2.3.6",
            "xtend": "~4.0.1"
@@ -910,12 +943,14 @@
    "deep-extend": {
      "version": "0.6.0",
      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
-      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="
+      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
+      "optional": true
    },
    "delayed-stream": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+      "optional": true
    },
    "diff": {
      "version": "1.3.2",
@@ -969,6 +1004,7 @@
      "version": "4.4.3",
      "resolved": "https://registry.npmjs.org/download/-/download-4.4.3.tgz",
      "integrity": "sha1-qlX9rTktldS2jowr4D4MKqIbqaw=",
+      "optional": true,
      "requires": {
        "caw": "^1.0.1",
        "concat-stream": "^1.4.7",
@@ -1015,6 +1051,7 @@
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/each-async/-/each-async-1.1.1.tgz",
      "integrity": "sha1-3uUim98KtrogEqOV4bhpq/iBNHM=",
+      "optional": true,
      "requires": {
        "onetime": "^1.0.0",
        "set-immediate-shim": "^1.0.0"
@@ -1161,12 +1198,14 @@
    "extsprintf": {
      "version": "1.3.0",
      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
+      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
+      "optional": true
    },
    "fancy-log": {
      "version": "1.3.2",
      "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.2.tgz",
      "integrity": "sha1-9BEl49hPLn2JpD0G2VjI94vha+E=",
+      "optional": true,
      "requires": {
        "ansi-gray": "^0.1.1",
        "color-support": "^1.1.3",
@@ -1182,6 +1221,7 @@
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
      "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
+      "optional": true,
      "requires": {
        "pend": "~1.2.0"
      }
@@ -1213,12 +1253,14 @@
    "filename-reserved-regex": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-1.0.0.tgz",
-      "integrity": "sha1-5hz4BfDeHJhFZ9A4bcXfUO5a9+Q="
+      "integrity": "sha1-5hz4BfDeHJhFZ9A4bcXfUO5a9+Q=",
+      "optional": true
    },
    "filenamify": {
      "version": "1.2.1",
      "resolved": "https://registry.npmjs.org/filenamify/-/filenamify-1.2.1.tgz",
      "integrity": "sha1-qfL/0RxQO+0wABUCknI3jx8TZaU=",
+      "optional": true,
      "requires": {
        "filename-reserved-regex": "^1.0.0",
        "strip-outer": "^1.0.0",
@@ -1330,7 +1372,8 @@
    "fs-constants": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
-      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="
+      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
+      "optional": true
    },
    "fs.realpath": {
      "version": "1.0.0",
@@ -1349,6 +1392,7 @@
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/get-proxy/-/get-proxy-1.1.0.tgz",
      "integrity": "sha1-iUhUSRvFkbDxR9euVw9cZ4tyVus=",
+      "optional": true,
      "requires": {
        "rc": "^1.1.2"
      }
@@ -1507,6 +1551,7 @@
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.1.tgz",
      "integrity": "sha512-ynYqXLoluBKf9XGR1gA59yEJisIL7YHEH4xr3ZziHB5/yl4qWfaK8Js9jGe6gBGCSCKVqiyO30WnRZADvemUNw==",
+      "optional": true,
      "requires": {
        "sparkles": "^1.0.0"
      }
@@ -1515,6 +1560,7 @@
      "version": "5.7.1",
      "resolved": "http://registry.npmjs.org/got/-/got-5.7.1.tgz",
      "integrity": "sha1-X4FjWmHkplifGAVp6k44FoClHzU=",
+      "optional": true,
      "requires": {
        "create-error-class": "^3.0.1",
        "duplexer2": "^0.1.4",
@@ -1857,6 +1903,7 @@
      "version": "1.2.0",
      "resolved": "https://registry.npmjs.org/gulp-decompress/-/gulp-decompress-1.2.0.tgz",
      "integrity": "sha1-jutlpeAV+O2FMsr+KEVJYGJvDcc=",
+      "optional": true,
      "requires": {
        "archive-type": "^3.0.0",
        "decompress": "^3.0.0",
@@ -1901,6 +1948,7 @@
      "version": "3.0.8",
      "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz",
      "integrity": "sha1-AFTh50RQLifATBh8PsxQXdVLu08=",
+      "optional": true,
      "requires": {
        "array-differ": "^1.0.0",
        "array-uniq": "^1.0.2",
@@ -1925,17 +1973,20 @@
        "dateformat": {
          "version": "2.2.0",
          "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-2.2.0.tgz",
-          "integrity": "sha1-QGXiATz5+5Ft39gu+1Bq1MZ2kGI="
+          "integrity": "sha1-QGXiATz5+5Ft39gu+1Bq1MZ2kGI=",
+          "optional": true
        },
        "object-assign": {
          "version": "3.0.0",
          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
-          "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I="
+          "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=",
+          "optional": true
        },
        "through2": {
          "version": "2.0.5",
          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
          "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+          "optional": true,
          "requires": {
            "readable-stream": "~2.3.6",
            "xtend": "~4.0.1"
@@ -1945,6 +1996,7 @@
          "version": "0.5.3",
          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz",
          "integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=",
+          "optional": true,
          "requires": {
            "clone": "^1.0.0",
            "clone-stats": "^0.0.1",
@@ -1957,6 +2009,7 @@
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz",
      "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=",
+      "optional": true,
      "requires": {
        "glogg": "^1.0.0"
      }
@@ -1999,6 +2052,7 @@
      "version": "0.1.0",
      "resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz",
      "integrity": "sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=",
+      "optional": true,
      "requires": {
        "sparkles": "^1.0.0"
      }
@@ -2018,7 +2072,8 @@
    "hoek": {
      "version": "2.16.3",
      "resolved": "http://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
-      "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0="
+      "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
+      "optional": true
    },
    "hooker": {
      "version": "0.2.3",
@@ -2198,7 +2253,8 @@
    "ini": {
      "version": "1.3.5",
      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
-      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="
+      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
+      "optional": true
    },
    "ip-regex": {
      "version": "1.0.3",
@@ -2210,6 +2266,7 @@
      "version": "0.1.7",
      "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz",
      "integrity": "sha1-hHSREZ/MtftDYhfMc39/qtUPYD8=",
+      "optional": true,
      "requires": {
        "is-relative": "^0.1.0"
      }
@@ -2235,7 +2292,8 @@
    "is-bzip2": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/is-bzip2/-/is-bzip2-1.0.0.tgz",
-      "integrity": "sha1-XuWOqlounIDiFAe+3yOuWsCRs/w="
+      "integrity": "sha1-XuWOqlounIDiFAe+3yOuWsCRs/w=",
+      "optional": true
    },
    "is-dotfile": {
      "version": "1.0.3",
@@ -2285,7 +2343,8 @@
    "is-gzip": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/is-gzip/-/is-gzip-1.0.0.tgz",
-      "integrity": "sha1-bKiwe5nHeZgCWQDlVc7Y7YCHmoM="
+      "integrity": "sha1-bKiwe5nHeZgCWQDlVc7Y7YCHmoM=",
+      "optional": true
    },
    "is-jpg": {
      "version": "1.0.1",
@@ -2296,7 +2355,8 @@
    "is-natural-number": {
      "version": "2.1.1",
      "resolved": "https://registry.npmjs.org/is-natural-number/-/is-natural-number-2.1.1.tgz",
-      "integrity": "sha1-fUxXKDd+84bD4ZSpkRv1fG3DNec="
+      "integrity": "sha1-fUxXKDd+84bD4ZSpkRv1fG3DNec=",
+      "optional": true
    },
    "is-number": {
      "version": "2.1.0",
@@ -2309,7 +2369,8 @@
    "is-obj": {
      "version": "1.0.1",
      "resolved": "http://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
-      "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8="
+      "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
+      "optional": true
    },
    "is-png": {
      "version": "1.1.0",
@@ -2330,17 +2391,20 @@
    "is-redirect": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz",
-      "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ="
+      "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=",
+      "optional": true
    },
    "is-relative": {
      "version": "0.1.3",
      "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz",
-      "integrity": "sha1-kF/uiuhvRbPsYUvDwVyGnfCHboI="
+      "integrity": "sha1-kF/uiuhvRbPsYUvDwVyGnfCHboI=",
+      "optional": true
    },
    "is-retry-allowed": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz",
-      "integrity": "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ="
+      "integrity": "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=",
+      "optional": true
    },
    "is-stream": {
      "version": "1.1.0",
@@ -2356,7 +2420,8 @@
    "is-tar": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/is-tar/-/is-tar-1.0.0.tgz",
-      "integrity": "sha1-L2suF5LB9bs2UZrKqdZcDSb+hT0="
+      "integrity": "sha1-L2suF5LB9bs2UZrKqdZcDSb+hT0=",
+      "optional": true
    },
    "is-typedarray": {
      "version": "1.0.0",
@@ -2367,7 +2432,8 @@
    "is-url": {
      "version": "1.2.4",
      "resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz",
-      "integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww=="
+      "integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==",
+      "optional": true
    },
    "is-utf8": {
      "version": "0.2.1",
@@ -2382,7 +2448,8 @@
    "is-zip": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/is-zip/-/is-zip-1.0.0.tgz",
-      "integrity": "sha1-R7Co/004p2QxzP2ZqOFaTIa6IyU="
+      "integrity": "sha1-R7Co/004p2QxzP2ZqOFaTIa6IyU=",
+      "optional": true
    },
    "isarray": {
      "version": "1.0.0",
@@ -2431,7 +2498,8 @@
    "jsbn": {
      "version": "0.1.1",
      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
+      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
+      "optional": true
    },
    "jshint": {
      "version": "2.8.0",
@@ -2607,52 +2675,62 @@
    "lodash._basecopy": {
      "version": "3.0.1",
      "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
-      "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY="
+      "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=",
+      "optional": true
    },
    "lodash._basetostring": {
      "version": "3.0.1",
      "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz",
-      "integrity": "sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U="
+      "integrity": "sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U=",
+      "optional": true
    },
    "lodash._basevalues": {
      "version": "3.0.0",
      "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz",
-      "integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc="
+      "integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=",
+      "optional": true
    },
    "lodash._getnative": {
      "version": "3.9.1",
      "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
-      "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U="
+      "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=",
+      "optional": true
    },
    "lodash._isiterateecall": {
      "version": "3.0.9",
      "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
-      "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw="
+      "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=",
+      "optional": true
    },
    "lodash._reescape": {
      "version": "3.0.0",
      "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz",
-      "integrity": "sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo="
+      "integrity": "sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo=",
+      "optional": true
    },
    "lodash._reevaluate": {
      "version": "3.0.0",
      "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz",
-      "integrity": "sha1-WLx0xAZklTrgsSTYBpltrKQx4u0="
+      "integrity": "sha1-WLx0xAZklTrgsSTYBpltrKQx4u0=",
+      "optional": true
    },
    "lodash._reinterpolate": {
      "version": "3.0.0",
      "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
-      "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0="
+      "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=",
+      "optional": true
    },
    "lodash._root": {
      "version": "3.0.1",
      "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz",
-      "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI="
+      "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=",
+      "optional": true
    },
    "lodash.escape": {
      "version": "3.2.0",
      "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz",
      "integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=",
+      "optional": true,
      "requires": {
        "lodash._root": "^3.0.0"
      }
@@ -2660,12 +2738,14 @@
    "lodash.isarguments": {
      "version": "3.1.0",
      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
-      "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo="
+      "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=",
+      "optional": true
    },
    "lodash.isarray": {
      "version": "3.0.4",
      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
-      "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U="
+      "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=",
+      "optional": true
    },
    "lodash.isequal": {
      "version": "4.5.0",
@@ -2676,6 +2756,7 @@
      "version": "3.1.2",
      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
      "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
+      "optional": true,
      "requires": {
        "lodash._getnative": "^3.0.0",
        "lodash.isarguments": "^3.0.0",
@@ -2685,12 +2766,14 @@
    "lodash.restparam": {
      "version": "3.6.1",
      "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
-      "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU="
+      "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=",
+      "optional": true
    },
    "lodash.template": {
      "version": "3.6.2",
      "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz",
      "integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=",
+      "optional": true,
      "requires": {
        "lodash._basecopy": "^3.0.0",
        "lodash._basetostring": "^3.0.0",
@@ -2707,6 +2790,7 @@
      "version": "3.1.1",
      "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz",
      "integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=",
+      "optional": true,
      "requires": {
        "lodash._reinterpolate": "^3.0.0",
        "lodash.escape": "^3.0.0"
@@ -2739,7 +2823,8 @@
    "lowercase-keys": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
-      "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA=="
+      "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==",
+      "optional": true
    },
    "lpad-align": {
      "version": "1.1.2",
@@ -2848,12 +2933,14 @@
    "mime-db": {
      "version": "1.37.0",
      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.37.0.tgz",
-      "integrity": "sha512-R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg=="
+      "integrity": "sha512-R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg==",
+      "optional": true
    },
    "mime-types": {
      "version": "2.1.21",
      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.21.tgz",
      "integrity": "sha512-3iL6DbwpyLzjR3xHSFNFeb9Nz/M8WDkX33t1GFQnFOllWk8pOrh/LSrB5OXlnlW5P9LH73X6loW/eogc+F5lJg==",
+      "optional": true,
      "requires": {
        "mime-db": "~1.37.0"
      }
@@ -2912,6 +2999,7 @@
      "version": "0.1.2",
      "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
      "integrity": "sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=",
+      "optional": true,
      "requires": {
        "duplexer2": "0.0.2"
      },
@@ -2920,6 +3008,7 @@
          "version": "0.0.2",
          "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
          "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=",
+          "optional": true,
          "requires": {
            "readable-stream": "~1.1.9"
          }
@@ -2927,12 +3016,14 @@
        "isarray": {
          "version": "0.0.1",
          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+          "optional": true
        },
        "readable-stream": {
          "version": "1.1.14",
          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
          "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
+          "optional": true,
          "requires": {
            "core-util-is": "~1.0.0",
            "inherits": "~2.0.1",
@@ -2943,14 +3034,16 @@
        "string_decoder": {
          "version": "0.10.31",
          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+          "optional": true
        }
      }
    },
    "node-status-codes": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz",
-      "integrity": "sha1-WuVUHQJGRdMqWPzdyc7s6nrjrC8="
+      "integrity": "sha1-WuVUHQJGRdMqWPzdyc7s6nrjrC8=",
+      "optional": true
    },
    "nopt": {
      "version": "1.0.10",
@@ -3038,7 +3131,8 @@
    "onetime": {
      "version": "1.1.0",
      "resolved": "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
-      "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k="
+      "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=",
+      "optional": true
    },
    "optional": {
      "version": "0.1.4",
@@ -3074,7 +3168,8 @@
    "os-tmpdir": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+      "optional": true
    },
    "pako": {
      "version": "0.2.9",
@@ -3153,7 +3248,8 @@
    "pend": {
      "version": "1.2.0",
      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
-      "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA="
+      "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
+      "optional": true
    },
    "performance-now": {
      "version": "0.2.0",
@@ -3200,7 +3296,8 @@
    "prepend-http": {
      "version": "1.0.4",
      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
-      "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw="
+      "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
+      "optional": true
    },
    "preserve": {
      "version": "0.2.0",
@@ -3280,6 +3377,7 @@
      "version": "1.2.8",
      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
      "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
+      "optional": true,
      "requires": {
        "deep-extend": "^0.6.0",
        "ini": "~1.3.0",
@@ -3291,6 +3389,7 @@
      "version": "3.1.0",
      "resolved": "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz",
      "integrity": "sha1-NcPhd/IHjveJ7kv6+kNzB06u9Po=",
+      "optional": true,
      "requires": {
        "pinkie-promise": "^2.0.0",
        "readable-stream": "^2.0.0"
@@ -3460,7 +3559,8 @@
    "safer-buffer": {
      "version": "2.1.2",
      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "optional": true
    },
    "sax": {
      "version": "1.2.4",
@@ -3472,6 +3572,7 @@
      "version": "1.0.5",
      "resolved": "https://registry.npmjs.org/seek-bzip/-/seek-bzip-1.0.5.tgz",
      "integrity": "sha1-z+kXyz0nS8/6x5J1ivUxc+sfq9w=",
+      "optional": true,
      "requires": {
        "commander": "~2.8.1"
      }
@@ -3499,7 +3600,8 @@
    "set-immediate-shim": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz",
-      "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E="
+      "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=",
+      "optional": true
    },
    "shelljs": {
      "version": "0.3.0",
@@ -3553,7 +3655,8 @@
    "sparkles": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.1.tgz",
-      "integrity": "sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw=="
+      "integrity": "sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==",
+      "optional": true
    },
    "spdx-correct": {
      "version": "3.0.2",
@@ -3628,7 +3731,8 @@
    "stat-mode": {
      "version": "0.2.2",
      "resolved": "https://registry.npmjs.org/stat-mode/-/stat-mode-0.2.2.tgz",
-      "integrity": "sha1-5sgLYjEj19gM8TLOU480YokHJQI="
+      "integrity": "sha1-5sgLYjEj19gM8TLOU480YokHJQI=",
+      "optional": true
    },
    "stream-combiner2": {
      "version": "1.1.1",
@@ -3687,6 +3791,7 @@
      "version": "1.1.1",
      "resolved": "http://registry.npmjs.org/strip-dirs/-/strip-dirs-1.1.1.tgz",
      "integrity": "sha1-lgu9EoeETzl1pFWKoQOoJV4kVqA=",
+      "optional": true,
      "requires": {
        "chalk": "^1.0.0",
        "get-stdin": "^4.0.1",
@@ -3707,12 +3812,14 @@
    "strip-json-comments": {
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
+      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
+      "optional": true
    },
    "strip-outer": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.1.tgz",
      "integrity": "sha512-k55yxKHwaXnpYGsOzg4Vl8+tDrWylxDEpknGjhTiZB8dFRU5rTo9CAzeycivxV3s+zlTKwrs6WxMxR95n26kwg==",
+      "optional": true,
      "requires": {
        "escape-string-regexp": "^1.0.2"
      }
@@ -3721,6 +3828,7 @@
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/sum-up/-/sum-up-1.0.3.tgz",
      "integrity": "sha1-HGYfZnBX9jvLeHWqFDi8FiUlFW4=",
+      "optional": true,
      "requires": {
        "chalk": "^1.0.0"
      }
@@ -3782,6 +3890,7 @@
      "version": "1.6.2",
      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.2.tgz",
      "integrity": "sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==",
+      "optional": true,
      "requires": {
        "bl": "^1.0.0",
        "buffer-alloc": "^1.2.0",
@@ -3796,6 +3905,7 @@
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/tempfile/-/tempfile-1.1.1.tgz",
      "integrity": "sha1-W8xOrsxKsscH2LwR2ZzMmiyyh/I=",
+      "optional": true,
      "requires": {
        "os-tmpdir": "^1.0.0",
        "uuid": "^2.0.1"
@@ -3856,12 +3966,14 @@
    "time-stamp": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz",
-      "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM="
+      "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=",
+      "optional": true
    },
    "timed-out": {
      "version": "3.1.3",
      "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-3.1.3.tgz",
-      "integrity": "sha1-lYYL/MXHbCd/j4Mm/Q9bLiDrohc="
+      "integrity": "sha1-lYYL/MXHbCd/j4Mm/Q9bLiDrohc=",
+      "optional": true
    },
    "tiny-lr-fork": {
      "version": "0.0.5",
@@ -3892,7 +4004,8 @@
    "to-buffer": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz",
-      "integrity": "sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg=="
+      "integrity": "sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==",
+      "optional": true
    },
    "tough-cookie": {
      "version": "2.3.4",
@@ -3912,6 +4025,7 @@
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz",
      "integrity": "sha1-42RqLqTokTEr9+rObPsFOAvAHCE=",
+      "optional": true,
      "requires": {
        "escape-string-regexp": "^1.0.2"
      }
@@ -3919,12 +4033,14 @@
    "tunnel-agent": {
      "version": "0.4.3",
      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
-      "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us="
+      "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=",
+      "optional": true
    },
    "tweetnacl": {
      "version": "0.14.5",
      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
+      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
+      "optional": true
    },
    "typedarray": {
      "version": "0.0.6",
@@ -3976,7 +4092,8 @@
    "unzip-response": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.2.tgz",
-      "integrity": "sha1-uYTwh3/AqJwsdzzB73tbIytbBv4="
+      "integrity": "sha1-uYTwh3/AqJwsdzzB73tbIytbBv4=",
+      "optional": true
    },
    "uri-path": {
      "version": "0.0.2",
@@ -3992,6 +4109,7 @@
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
      "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
+      "optional": true,
      "requires": {
        "prepend-http": "^1.0.1"
      }
@@ -4062,6 +4180,7 @@
      "version": "1.2.1",
      "resolved": "https://registry.npmjs.org/vinyl-assign/-/vinyl-assign-1.2.1.tgz",
      "integrity": "sha1-TRmIkbVRWRHXcajNnFSApGoHSkU=",
+      "optional": true,
      "requires": {
        "object-assign": "^4.0.1",
        "readable-stream": "^2.0.0"
@@ -4111,6 +4230,7 @@
      "version": "1.3.0",
      "resolved": "https://registry.npmjs.org/ware/-/ware-1.3.0.tgz",
      "integrity": "sha1-0bFPOdLiy0q4xAmPdW/ksWTkc9Q=",
+      "optional": true,
      "requires": {
        "wrap-fn": "^0.1.0"
      }
@@ -4140,6 +4260,7 @@
      "version": "0.1.5",
      "resolved": "https://registry.npmjs.org/wrap-fn/-/wrap-fn-0.1.5.tgz",
      "integrity": "sha1-8htuQQFv9KfjFyDbxjoJAWvfmEU=",
+      "optional": true,
      "requires": {
        "co": "3.1.0"
      }
@@ -4176,6 +4297,7 @@
      "version": "2.10.0",
      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
      "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
+      "optional": true,
      "requires": {
        "buffer-crc32": "~0.2.3",
        "fd-slicer": "~1.1.0"