From 96a0eb81fc84db2103ed4ba662b7f7a874bb1e35 Mon Sep 17 00:00:00 2001
From: santiago carello <santiagocarello95@gmail.com>
Date: Tue, 22 Aug 2017 18:12:41 -0300
Subject: [PATCH 01/14] editadas vistas

---
 app/View/Estudiantes/index.ctp       |  8 ++---
 app/View/Helper/PlataformaHelper.php | 49 ++++++++++++++++++++++++++++
 app/View/Layouts/default.ctp         |  4 +--
 app/View/Users/add.ctp               |  2 +-
 app/View/Users/index.ctp             |  2 +-
 app/View/Users/login.ctp             |  4 +--
 6 files changed, 59 insertions(+), 10 deletions(-)

diff --git a/app/View/Estudiantes/index.ctp b/app/View/Estudiantes/index.ctp
index b281733..b8827c0 100755
--- a/app/View/Estudiantes/index.ctp
+++ b/app/View/Estudiantes/index.ctp
@@ -6,7 +6,7 @@ $this->Html->script('estudiante.index', array('inline' => false));
 
 <div class="row index">
   <div class="col-md-12 page-title">
-    <h2>Estudiantes</h2>
+    <h2><?php echo $this->Plataforma->obtenerEncuestado() ?></h2>
 
     <?php if (AuthComponent::user('role') == 'admin') { ?>
       <a
@@ -15,7 +15,7 @@ $this->Html->script('estudiante.index', array('inline' => false));
       >
         <span
           class="visible-md-inline visible-lg-inline"
-        >Agregar estudiante</span>
+        >Agregar <?php echo strtolower($this->Plataforma->obtenerEncuestado())?></span>
         <span
           class="glyphicon glyphicon-plus visible-xs-inline visible-sm-inline"
         ></span>
@@ -28,7 +28,7 @@ $this->Html->script('estudiante.index', array('inline' => false));
       <thead>
         <tr>
           <th>
-            <?php echo $this->Paginator->sort('legajo'); ?>
+            <?php echo $this->Paginator->sort($this->Plataforma->obtenerID()); ?>
           </th>
           <th>
             <?php echo $this->Paginator->sort('nombre'); ?>
@@ -37,7 +37,7 @@ $this->Html->script('estudiante.index', array('inline' => false));
             <?php echo $this->Paginator->sort('Carrera.descripcion', 'Carrera'); ?>
           </th>
           <th data-breakpoints="xs" data-type="html">
-            <?php echo $this->Paginator->sort('User.username', 'Tutor'); ?>
+            <?php echo $this->Paginator->sort('User.username', $this->Plataforma->obtenerUsuario()); ?>
           </th>
           <th data-breakpoints="xs sm" data-type="html" class="tx-actions"></th>
         </tr>
diff --git a/app/View/Helper/PlataformaHelper.php b/app/View/Helper/PlataformaHelper.php
index d6f23c3..eff2046 100644
--- a/app/View/Helper/PlataformaHelper.php
+++ b/app/View/Helper/PlataformaHelper.php
@@ -54,6 +54,55 @@ public function obtenerTitulo($texto = null) {
 		return h($titulo);
 	}
 
+/**
+ * Obtiene el encuestado de la plataforma
+ *
+ * @param string|null $texto Especifica una cadena adicional para el encuestado.
+ *
+ * @return string
+ */
+	public function obtenerEncuestado($texto = null) {
+		$titulo = !$this->esGraduados() ? 'Estudiantes' : 'Graduados';
+		if ($texto) {
+			$titulo .= " - $texto";
+		}
+
+		return h($titulo);
+	}
+
+/**
+ * Obtiene el ID de los usuarios de la plataforma
+ *
+ * @param string|null $texto Especifica una cadena adicional para el ID.
+ *
+ * @return string
+ */
+	public function obtenerID($texto = null) {
+		$titulo = !$this->esGraduados() ? 'Legajo' : 'DNI';
+		if ($texto) {
+			$titulo .= " - $texto";
+		}
+
+		return h($titulo);
+	}
+
+/**
+ * Obtiene el nombre de los usuarios de la plataforma
+ *
+ * @param string|null $texto Especifica una cadena adicional para el usuario.
+ *
+ * @return string
+ */
+	public function obtenerUsuario($texto = null) {
+		$titulo = !$this->esGraduados() ? 'Tutor' : 'Usuario';
+		if ($texto) {
+			$titulo .= " - $texto";
+		}
+
+		return h($titulo);
+	}
+
+
 /**
  * Comprueba si la instalación corresponde a la versión de Graduados.
  *
diff --git a/app/View/Layouts/default.ctp b/app/View/Layouts/default.ctp
index 78b0dab..5749d32 100755
--- a/app/View/Layouts/default.ctp
+++ b/app/View/Layouts/default.ctp
@@ -78,7 +78,7 @@ $cakeVersion = __d('cake_dev', 'CakePHP %s', Configure::version())
               'class' => 'logo'
             ));
             ?>
-            <span>Tutorías</span>
+            <span> <?php echo $this->Plataforma->obtenerTitulo() ?></span>
           </a>
         </div>
 
@@ -89,7 +89,7 @@ $cakeVersion = __d('cake_dev', 'CakePHP %s', Configure::version())
               <li <?php if ($this->request->params['controller'] == 'estudiantes') { echo 'class="active"'; } ?> >
                 <?php
                 echo $this->Html->link(
-                  'Estudiantes',
+                  $this->Plataforma->obtenerEncuestado() ,
                   array('controller' => 'estudiantes', 'action' => 'index')
                 );
                 ?>
diff --git a/app/View/Users/add.ctp b/app/View/Users/add.ctp
index 9e81f3e..b999157 100755
--- a/app/View/Users/add.ctp
+++ b/app/View/Users/add.ctp
@@ -68,7 +68,7 @@ $this->Html->script('user.form-app', array('inline' => false));
           'id' => 'role',
           'label' => false,
           'class' => 'form-control',
-          'options' => array('tutor' => 'Tutor', 'admin' => 'Administrador')
+          'options' => array(strtolower($this->Plataforma->obtenerTitulo()) =>  $this->Plataforma->obtenerUsuario() , 'admin' => 'Administrador')
         ));
         ?>
       </div>
diff --git a/app/View/Users/index.ctp b/app/View/Users/index.ctp
index 92fe1cc..1371b0d 100755
--- a/app/View/Users/index.ctp
+++ b/app/View/Users/index.ctp
@@ -92,7 +92,7 @@ $this->Html->script('user.index', array('inline' => false));
         <div class="modal-content">
           <div class="modal-header">
             <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-            <h4 class="modal-title" id="myModalLabel">Eliminar estudiante</h4>
+            <h4 class="modal-title" id="myModalLabel">Eliminar <?php echo strtolower($this->Plataforma->obtenerTitulo()) ?></h4>
           </div>
           <div class="modal-body"></div>
           <div class="modal-footer">
diff --git a/app/View/Users/login.ctp b/app/View/Users/login.ctp
index a513cb7..451ed2d 100755
--- a/app/View/Users/login.ctp
+++ b/app/View/Users/login.ctp
@@ -1,5 +1,5 @@
 <?php
-$this->assign('title', 'Tutorías - UTN FRD');
+$this->assign('title', $this->Plataforma->obtenerTitulo('UTN FRD'));
 $this->Html->css('user', array('inline' => false));
 ?>
 
@@ -13,7 +13,7 @@ $this->Html->css('user', array('inline' => false));
       Por favor, ingrese su nombre de usuario y contraseña.
     </p>
     <p>
-      Si olvidó sus credenciales de acceso, por favor, comuníquese con el administrador de tutorías o diríjase a la oficina de SAE.
+      Si olvidó sus credenciales de acceso, por favor, comuníquese con el administrador de <?php echo strtolower($this->Plataforma->obtenerTitulo()) ?> o diríjase a la oficina de SAE.
     </p>
   </div>
 

From eaa298531c6de2269fbdde840d4f4cd2cde352d1 Mon Sep 17 00:00:00 2001
From: santiago carello <santiagocarello95@gmail.com>
Date: Wed, 23 Aug 2017 17:08:34 -0300
Subject: [PATCH 02/14] editado un NotFoundException

'Estudiante invalido' ->

$this->Plataforma->obtenerEncuestado() . ' invalido'
---
 app/Controller/EncuestasController.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Controller/EncuestasController.php b/app/Controller/EncuestasController.php
index 168760e..ab75ef5 100755
--- a/app/Controller/EncuestasController.php
+++ b/app/Controller/EncuestasController.php
@@ -7,7 +7,7 @@ public function index($id = null) {
 
 		$this->Encuesta->Estudiante->id = $id;
 		if (!$this->Encuesta->Estudiante->exists()) {
-			throw new NotFoundException('Estudiante inválido');
+			throw new NotFoundException(substr($this->Plataforma->obtenerEncuestado(),0,-1) . ' inválido');
 		}
 
 		$estudiante = $this->Encuesta->Estudiante->read();
@@ -23,7 +23,7 @@ public function regenerate($id = null) {
 
 		$this->Encuesta->Estudiante->id = $id;
 		if (!$this->Encuesta->Estudiante->exists()) {
-			throw new NotFoundException('Estudiante inválido');
+			throw new NotFoundException(substr($this->Plataforma->obtenerEncuestado(),0,-1) . ' inválido');
 		}
 
 		$estudiante = $this->Encuesta->Estudiante->read();
@@ -41,7 +41,7 @@ public function save() {
 		$this->Encuesta->id = $this->data['encuestaId'];
 
 		if (!$this->Encuesta->exists()) {
-			throw new NotFoundException('Estudiante inválido');
+			throw new NotFoundException(substr($this->Plataforma->obtenerEncuestado(),0,-1) . ' inválido');
 		}
 
 		$this->Encuesta->set('respuesta', $this->data['respuesta']);

From 2ded5e216d45dadc2c6709e1c485652afb206031 Mon Sep 17 00:00:00 2001
From: Jorge Alberto Cricelli <jacricelli@gmail.com>
Date: Sun, 27 Aug 2017 22:58:22 -0300
Subject: [PATCH 03/14] Actualizar dependencias

---
 composer.lock     |   25 +-
 package-lock.json | 1250 ++++++++++++++++++++++++++++++++++++++-------
 2 files changed, 1088 insertions(+), 187 deletions(-)

diff --git a/composer.lock b/composer.lock
index 97c1c31..4596607 100644
--- a/composer.lock
+++ b/composer.lock
@@ -46,16 +46,16 @@
         },
         {
             "name": "cakephp/cakephp",
-            "version": "2.9.9",
+            "version": "2.10.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/cakephp/cakephp.git",
-                "reference": "bfd2d21d782a69626bcf1ae2d22aad6e565fb29c"
+                "reference": "95e0a2143934abed3baf33885032eefcf9081605"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/cakephp/cakephp/zipball/bfd2d21d782a69626bcf1ae2d22aad6e565fb29c",
-                "reference": "bfd2d21d782a69626bcf1ae2d22aad6e565fb29c",
+                "url": "https://api.github.com/repos/cakephp/cakephp/zipball/95e0a2143934abed3baf33885032eefcf9081605",
+                "reference": "95e0a2143934abed3baf33885032eefcf9081605",
                 "shasum": ""
             },
             "require": {
@@ -64,7 +64,7 @@
             },
             "require-dev": {
                 "cakephp/cakephp-codesniffer": "^1.0.0",
-                "phpunit/phpunit": "3.7.*"
+                "phpunit/phpunit": "<6.0.0"
             },
             "bin": [
                 "lib/Cake/Console/cake"
@@ -85,20 +85,20 @@
             "keywords": [
                 "framework"
             ],
-            "time": "2017-05-26T01:15:23+00:00"
+            "time": "2017-08-08T01:21:35+00:00"
         },
         {
             "name": "composer/installers",
-            "version": "v1.3.0",
+            "version": "v1.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/installers.git",
-                "reference": "79ad876c7498c0bbfe7eed065b8651c93bfd6045"
+                "reference": "9ce17fb70e9a38dd8acff0636a29f5cf4d575c1b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/installers/zipball/79ad876c7498c0bbfe7eed065b8651c93bfd6045",
-                "reference": "79ad876c7498c0bbfe7eed065b8651c93bfd6045",
+                "url": "https://api.github.com/repos/composer/installers/zipball/9ce17fb70e9a38dd8acff0636a29f5cf4d575c1b",
+                "reference": "9ce17fb70e9a38dd8acff0636a29f5cf4d575c1b",
                 "shasum": ""
             },
             "require": {
@@ -144,6 +144,7 @@
                 "Hurad",
                 "ImageCMS",
                 "Kanboard",
+                "Lan Management System",
                 "MODX Evo",
                 "Mautic",
                 "Maya",
@@ -167,6 +168,7 @@
                 "croogo",
                 "dokuwiki",
                 "drupal",
+                "eZ Platform",
                 "elgg",
                 "expressionengine",
                 "fuelphp",
@@ -183,6 +185,7 @@
                 "mediawiki",
                 "modulework",
                 "moodle",
+                "osclass",
                 "phpbb",
                 "piwik",
                 "ppi",
@@ -199,7 +202,7 @@
                 "zend",
                 "zikula"
             ],
-            "time": "2017-04-24T06:37:16+00:00"
+            "time": "2017-08-09T07:53:48+00:00"
         }
     ],
     "packages-dev": [
diff --git a/package-lock.json b/package-lock.json
index ed8846d..3bcc8a4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2,32 +2,32 @@
   "name": "utn-frd-tutorias",
   "version": "1.0.1",
   "lockfileVersion": 1,
+  "requires": true,
   "dependencies": {
     "abbrev": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz",
       "integrity": "sha1-0FVMIlZjbi9W58LlrRg/hZQo2B8="
     },
-    "acorn": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
-      "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo="
-    },
-    "acorn-jsx": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz",
-      "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s="
-    },
     "ajv": {
       "version": "4.11.8",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
       "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
-      "optional": true
+      "optional": true,
+      "requires": {
+        "co": "4.6.0",
+        "json-stable-stringify": "1.0.1"
+      }
     },
     "align-text": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz",
-      "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc="
+      "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=",
+      "requires": {
+        "kind-of": "3.2.2",
+        "longest": "1.0.1",
+        "repeat-string": "1.6.1"
+      }
     },
     "amdefine": {
       "version": "1.0.1",
@@ -48,6 +48,16 @@
       "version": "0.13.1",
       "resolved": "https://registry.npmjs.org/archiver/-/archiver-0.13.1.tgz",
       "integrity": "sha1-r8azVhpjZDs4omeIkSqDhU7KoPE=",
+      "requires": {
+        "async": "0.9.2",
+        "buffer-crc32": "0.2.13",
+        "glob": "4.3.5",
+        "lazystream": "0.1.0",
+        "lodash": "2.4.2",
+        "readable-stream": "1.0.34",
+        "tar-stream": "1.1.5",
+        "zip-stream": "0.5.2"
+      },
       "dependencies": {
         "async": {
           "version": "0.9.2",
@@ -57,7 +67,13 @@
         "glob": {
           "version": "4.3.5",
           "resolved": "https://registry.npmjs.org/glob/-/glob-4.3.5.tgz",
-          "integrity": "sha1-gPuwjKVA8jiszl0R0em8QedRc9M="
+          "integrity": "sha1-gPuwjKVA8jiszl0R0em8QedRc9M=",
+          "requires": {
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "2.0.10",
+            "once": "1.4.0"
+          }
         },
         "lodash": {
           "version": "2.4.2",
@@ -67,7 +83,10 @@
         "minimatch": {
           "version": "2.0.10",
           "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
-          "integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc="
+          "integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=",
+          "requires": {
+            "brace-expansion": "1.1.8"
+          }
         }
       }
     },
@@ -75,6 +94,10 @@
       "version": "0.1.16",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-0.1.16.tgz",
       "integrity": "sha1-z9AeD7uj1srtBJ+9dY1A9lGW9Xw=",
+      "requires": {
+        "underscore": "1.7.0",
+        "underscore.string": "2.4.0"
+      },
       "dependencies": {
         "underscore.string": {
           "version": "2.4.0",
@@ -134,6 +157,11 @@
       "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=",
       "optional": true
     },
+    "babylon": {
+      "version": "7.0.0-beta.21",
+      "resolved": "https://registry.npmjs.org/babylon/-/babylon-7.0.0-beta.21.tgz",
+      "integrity": "sha512-fjhepTXb+WS5Iyu+DATZA5maLpuqaGckPnCgmnIWG80Xkm4SxA1mdTsBHMvaMSbdSKj/4Pocd4pUkI4qgL2wwQ=="
+    },
     "balanced-match": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
@@ -143,23 +171,41 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
       "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
-      "optional": true
+      "optional": true,
+      "requires": {
+        "tweetnacl": "0.14.5"
+      }
     },
     "bl": {
       "version": "0.9.5",
       "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.5.tgz",
-      "integrity": "sha1-wGt5evCF6gC8Unr8jvzxHeIjIFQ="
+      "integrity": "sha1-wGt5evCF6gC8Unr8jvzxHeIjIFQ=",
+      "requires": {
+        "readable-stream": "1.0.34"
+      }
     },
     "bluebird": {
-      "version": "3.4.7",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz",
-      "integrity": "sha1-9y12C+Cbf3bQjtj66Ysomo0F+rM="
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz",
+      "integrity": "sha1-eRQg1/VR7qKJdFOop3ZT+WYG1nw="
     },
     "body-parser": {
       "version": "1.14.2",
       "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.14.2.tgz",
       "integrity": "sha1-EBXLH+LEQ4WCWVgdtTMy+NDPUPk=",
       "dev": true,
+      "requires": {
+        "bytes": "2.2.0",
+        "content-type": "1.0.2",
+        "debug": "2.2.0",
+        "depd": "1.1.0",
+        "http-errors": "1.3.1",
+        "iconv-lite": "0.4.13",
+        "on-finished": "2.3.0",
+        "qs": "5.2.0",
+        "raw-body": "2.1.7",
+        "type-is": "1.6.15"
+      },
       "dependencies": {
         "iconv-lite": {
           "version": "0.4.13",
@@ -178,7 +224,10 @@
     "boom": {
       "version": "2.10.1",
       "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
-      "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8="
+      "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
+      "requires": {
+        "hoek": "2.16.3"
+      }
     },
     "bootstrap": {
       "version": "3.3.7",
@@ -188,7 +237,11 @@
     "bootstrap-daterangepicker": {
       "version": "2.1.25",
       "resolved": "https://registry.npmjs.org/bootstrap-daterangepicker/-/bootstrap-daterangepicker-2.1.25.tgz",
-      "integrity": "sha1-/Ni6C3VaBU0zDXo7fE3Yu4Vc/7c="
+      "integrity": "sha1-/Ni6C3VaBU0zDXo7fE3Yu4Vc/7c=",
+      "requires": {
+        "jquery": "2.2.4",
+        "moment": "2.15.2"
+      }
     },
     "bootstrap-toggle": {
       "version": "2.2.2",
@@ -198,12 +251,19 @@
     "brace-expansion": {
       "version": "1.1.8",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
-      "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI="
+      "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
+      "requires": {
+        "balanced-match": "1.0.0",
+        "concat-map": "0.0.1"
+      }
     },
     "browserify-zlib": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz",
-      "integrity": "sha1-uzX4pRn2AOD6a4SFJByXnQFB+y0="
+      "integrity": "sha1-uzX4pRn2AOD6a4SFJByXnQFB+y0=",
+      "requires": {
+        "pako": "0.2.9"
+      }
     },
     "buffer-crc32": {
       "version": "0.2.13",
@@ -229,7 +289,11 @@
     "camelcase-keys": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
-      "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc="
+      "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
+      "requires": {
+        "camelcase": "2.1.1",
+        "map-obj": "1.0.1"
+      }
     },
     "caseless": {
       "version": "0.12.0",
@@ -238,49 +302,87 @@
       "optional": true
     },
     "catharsis": {
-      "version": "0.8.8",
-      "resolved": "https://registry.npmjs.org/catharsis/-/catharsis-0.8.8.tgz",
-      "integrity": "sha1-aTR59DqsVJ2Aa9c+kkzQ2USVGgY="
+      "version": "0.8.9",
+      "resolved": "https://registry.npmjs.org/catharsis/-/catharsis-0.8.9.tgz",
+      "integrity": "sha1-mMyJDKZS3S7w5ws3klMQ/56Q/Is=",
+      "requires": {
+        "underscore-contrib": "0.3.0"
+      }
     },
     "center-align": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz",
-      "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60="
+      "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=",
+      "requires": {
+        "align-text": "0.1.4",
+        "lazy-cache": "1.0.4"
+      }
     },
     "chalk": {
       "version": "0.5.1",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
-      "integrity": "sha1-Zjs6ZItotV0EaQ1JFnqoN4WPIXQ="
+      "integrity": "sha1-Zjs6ZItotV0EaQ1JFnqoN4WPIXQ=",
+      "requires": {
+        "ansi-styles": "1.1.0",
+        "escape-string-regexp": "1.0.5",
+        "has-ansi": "0.1.0",
+        "strip-ansi": "0.3.0",
+        "supports-color": "0.2.0"
+      }
     },
     "clean-css": {
       "version": "3.4.27",
       "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-3.4.27.tgz",
-      "integrity": "sha1-re91sxwWD/pdcvTeZ5ZuJmDBolU="
+      "integrity": "sha1-re91sxwWD/pdcvTeZ5ZuJmDBolU=",
+      "requires": {
+        "commander": "2.8.1",
+        "source-map": "0.4.4"
+      }
     },
     "cli": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/cli/-/cli-1.0.1.tgz",
       "integrity": "sha1-IoF1NPJL+klQw01TLUjsvGIbjBQ=",
       "dev": true,
+      "requires": {
+        "exit": "0.1.2",
+        "glob": "7.1.2"
+      },
       "dependencies": {
         "glob": {
           "version": "7.1.2",
           "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
           "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-          "dev": 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"
+          }
         },
         "minimatch": {
           "version": "3.0.4",
           "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
           "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-          "dev": true
+          "dev": true,
+          "requires": {
+            "brace-expansion": "1.1.8"
+          }
         }
       }
     },
     "cliui": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
-      "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE="
+      "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
+      "requires": {
+        "center-align": "0.1.3",
+        "right-align": "0.1.3",
+        "wordwrap": "0.0.2"
+      }
     },
     "co": {
       "version": "4.6.0",
@@ -301,17 +403,29 @@
     "combined-stream": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
-      "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk="
+      "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=",
+      "requires": {
+        "delayed-stream": "1.0.0"
+      }
     },
     "commander": {
       "version": "2.8.1",
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz",
-      "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ="
+      "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=",
+      "requires": {
+        "graceful-readlink": "1.0.1"
+      }
     },
     "compress-commons": {
       "version": "0.2.9",
       "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-0.2.9.tgz",
-      "integrity": "sha1-Qi2SdDDAGr0GzUVbbfwEy0z4ADw="
+      "integrity": "sha1-Qi2SdDDAGr0GzUVbbfwEy0z4ADw=",
+      "requires": {
+        "buffer-crc32": "0.2.13",
+        "crc32-stream": "0.3.4",
+        "node-int64": "0.3.3",
+        "readable-stream": "1.0.34"
+      }
     },
     "concat-map": {
       "version": "0.0.1",
@@ -322,6 +436,11 @@
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz",
       "integrity": "sha1-CqxmL9Ur54lk1VMvaUeE5wEQrPc=",
+      "requires": {
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.3",
+        "typedarray": "0.0.6"
+      },
       "dependencies": {
         "isarray": {
           "version": "1.0.0",
@@ -331,12 +450,24 @@
         "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=="
+          "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
+          "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=="
+          "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+          "requires": {
+            "safe-buffer": "5.1.1"
+          }
         }
       }
     },
@@ -344,7 +475,10 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
       "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "date-now": "0.1.4"
+      }
     },
     "content-type": {
       "version": "1.0.2",
@@ -360,24 +494,37 @@
     "crc32-stream": {
       "version": "0.3.4",
       "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-0.3.4.tgz",
-      "integrity": "sha1-c7wltF+sHbZjIjGnv86JJ+nwZVI="
+      "integrity": "sha1-c7wltF+sHbZjIjGnv86JJ+nwZVI=",
+      "requires": {
+        "buffer-crc32": "0.2.13",
+        "readable-stream": "1.0.34"
+      }
     },
     "cryptiles": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
       "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
-      "optional": true
+      "optional": true,
+      "requires": {
+        "boom": "2.10.1"
+      }
     },
     "currently-unhandled": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
-      "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o="
+      "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
+      "requires": {
+        "array-find-index": "1.0.2"
+      }
     },
     "dashdash": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
       "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
       "optional": true,
+      "requires": {
+        "assert-plus": "1.0.0"
+      },
       "dependencies": {
         "assert-plus": {
           "version": "1.0.0",
@@ -402,7 +549,10 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
       "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "ms": "0.7.1"
+      }
     },
     "decamelize": {
       "version": "1.2.0",
@@ -425,6 +575,10 @@
       "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
       "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=",
       "dev": true,
+      "requires": {
+        "domelementtype": "1.1.3",
+        "entities": "1.1.1"
+      },
       "dependencies": {
         "domelementtype": {
           "version": "1.1.3",
@@ -450,13 +604,20 @@
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz",
       "integrity": "sha1-LeWaCCLVAn+r/28DLCsloqir5zg=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "domelementtype": "1.3.0"
+      }
     },
     "domutils": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
       "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "dom-serializer": "0.1.0",
+        "domelementtype": "1.3.0"
+      }
     },
     "duplexer": {
       "version": "0.1.1",
@@ -467,7 +628,10 @@
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
       "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
-      "optional": true
+      "optional": true,
+      "requires": {
+        "jsbn": "0.1.1"
+      }
     },
     "ee-first": {
       "version": "1.1.1",
@@ -478,7 +642,10 @@
     "end-of-stream": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.0.tgz",
-      "integrity": "sha1-epDYM+/abPpurA9JSduw+tOmMgY="
+      "integrity": "sha1-epDYM+/abPpurA9JSduw+tOmMgY=",
+      "requires": {
+        "once": "1.4.0"
+      }
     },
     "entities": {
       "version": "1.0.0",
@@ -490,23 +657,24 @@
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.4.tgz",
       "integrity": "sha1-uJbiOp5ei6M4cfyZar02NfyaHH0=",
-      "optional": true
+      "optional": true,
+      "requires": {
+        "prr": "0.0.0"
+      }
     },
     "error-ex": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz",
-      "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw="
+      "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=",
+      "requires": {
+        "is-arrayish": "0.2.1"
+      }
     },
     "escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
       "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
     },
-    "espree": {
-      "version": "3.1.7",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-3.1.7.tgz",
-      "integrity": "sha1-/V3ux2qXpRIKnNOnyxF3oJI7EdI="
-    },
     "esprima": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz",
@@ -537,12 +705,19 @@
       "version": "0.10.0",
       "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz",
       "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "websocket-driver": "0.6.5"
+      }
     },
     "figures": {
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
-      "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4="
+      "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
+      "requires": {
+        "escape-string-regexp": "1.0.5",
+        "object-assign": "4.1.1"
+      }
     },
     "file-sync-cmp": {
       "version": "0.1.1",
@@ -552,17 +727,29 @@
     "find-up": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-      "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8="
+      "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
+      "requires": {
+        "path-exists": "2.1.0",
+        "pinkie-promise": "2.0.1"
+      }
     },
     "findup-sync": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
       "integrity": "sha1-fz56l7gjksZTvwZYm9hRkOk8NoM=",
+      "requires": {
+        "glob": "3.2.11",
+        "lodash": "2.4.2"
+      },
       "dependencies": {
         "glob": {
           "version": "3.2.11",
           "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
-          "integrity": "sha1-Spc/Y1uRkPcV0QmH1cAP0oFevj0="
+          "integrity": "sha1-Spc/Y1uRkPcV0QmH1cAP0oFevj0=",
+          "requires": {
+            "inherits": "2.0.3",
+            "minimatch": "0.3.0"
+          }
         },
         "lodash": {
           "version": "2.4.2",
@@ -572,12 +759,28 @@
         "minimatch": {
           "version": "0.3.0",
           "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
-          "integrity": "sha1-J12O2qxPG7MyZHIInnlJyDlGmd0="
+          "integrity": "sha1-J12O2qxPG7MyZHIInnlJyDlGmd0=",
+          "requires": {
+            "lru-cache": "2.7.3",
+            "sigmund": "1.0.1"
+          }
         }
       }
     },
     "footable": {
       "version": "github:fooplugins/FooTable#f4046aceabde939e8b02fc4a6ee7d0dbd4108f9e",
+      "requires": {
+        "grunt": "0.4.5",
+        "grunt-contrib-clean": "0.4.1",
+        "grunt-contrib-compress": "0.13.0",
+        "grunt-contrib-concat": "0.3.0",
+        "grunt-contrib-copy": "0.8.2",
+        "grunt-contrib-cssmin": "0.14.0",
+        "grunt-contrib-uglify": "0.11.1",
+        "grunt-jsdoc": "1.1.0",
+        "jsdoc": "3.5.4",
+        "jsdoc-oblivion": "0.0.4"
+      },
       "dependencies": {
         "ansi-regex": {
           "version": "2.1.1",
@@ -592,12 +795,41 @@
         "chalk": {
           "version": "1.1.3",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg="
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "requires": {
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
+          }
         },
         "grunt": {
           "version": "0.4.5",
           "resolved": "https://registry.npmjs.org/grunt/-/grunt-0.4.5.tgz",
-          "integrity": "sha1-VpN81RlDJK3/bSB2MYMqnWuk5/A="
+          "integrity": "sha1-VpN81RlDJK3/bSB2MYMqnWuk5/A=",
+          "requires": {
+            "async": "0.1.22",
+            "coffee-script": "1.3.3",
+            "colors": "0.6.2",
+            "dateformat": "1.0.2-1.2.3",
+            "eventemitter2": "0.4.14",
+            "exit": "0.1.2",
+            "findup-sync": "0.1.3",
+            "getobject": "0.1.0",
+            "glob": "3.1.21",
+            "grunt-legacy-log": "0.1.3",
+            "grunt-legacy-util": "0.2.0",
+            "hooker": "0.2.3",
+            "iconv-lite": "0.2.11",
+            "js-yaml": "2.0.5",
+            "lodash": "0.9.2",
+            "minimatch": "0.2.14",
+            "nopt": "1.0.10",
+            "rimraf": "2.2.8",
+            "underscore.string": "2.2.1",
+            "which": "1.0.9"
+          }
         },
         "grunt-contrib-clean": {
           "version": "0.4.1",
@@ -607,17 +839,33 @@
         "grunt-contrib-copy": {
           "version": "0.8.2",
           "resolved": "https://registry.npmjs.org/grunt-contrib-copy/-/grunt-contrib-copy-0.8.2.tgz",
-          "integrity": "sha1-3zHJD/zECbyfr+ROwN0eQlmRb+o="
+          "integrity": "sha1-3zHJD/zECbyfr+ROwN0eQlmRb+o=",
+          "requires": {
+            "chalk": "1.1.3",
+            "file-sync-cmp": "0.1.1"
+          }
         },
         "grunt-contrib-cssmin": {
           "version": "0.14.0",
           "resolved": "https://registry.npmjs.org/grunt-contrib-cssmin/-/grunt-contrib-cssmin-0.14.0.tgz",
-          "integrity": "sha1-iLCpJTaWm7VmKBxcYexQYtgz87c="
+          "integrity": "sha1-iLCpJTaWm7VmKBxcYexQYtgz87c=",
+          "requires": {
+            "chalk": "1.1.3",
+            "clean-css": "3.4.27",
+            "maxmin": "1.1.0"
+          }
         },
         "grunt-contrib-uglify": {
           "version": "0.11.1",
           "resolved": "https://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-0.11.1.tgz",
           "integrity": "sha1-XiKi9nbNEdhx/CoPCKqbKXMEUyU=",
+          "requires": {
+            "chalk": "1.1.3",
+            "lodash": "4.17.4",
+            "maxmin": "2.1.0",
+            "uglify-js": "2.6.4",
+            "uri-path": "1.0.0"
+          },
           "dependencies": {
             "lodash": {
               "version": "4.17.4",
@@ -627,29 +875,47 @@
             "maxmin": {
               "version": "2.1.0",
               "resolved": "https://registry.npmjs.org/maxmin/-/maxmin-2.1.0.tgz",
-              "integrity": "sha1-TTsiCQPZXu5+t6x/qGTnLcCaMWY="
+              "integrity": "sha1-TTsiCQPZXu5+t6x/qGTnLcCaMWY=",
+              "requires": {
+                "chalk": "1.1.3",
+                "figures": "1.7.0",
+                "gzip-size": "3.0.0",
+                "pretty-bytes": "3.0.1"
+              }
             }
           }
         },
         "gzip-size": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-3.0.0.tgz",
-          "integrity": "sha1-VGGI6b3DN/Zzdy+BZgRks4nc5SA="
+          "integrity": "sha1-VGGI6b3DN/Zzdy+BZgRks4nc5SA=",
+          "requires": {
+            "duplexer": "0.1.1"
+          }
         },
         "has-ansi": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-          "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE="
+          "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+          "requires": {
+            "ansi-regex": "2.1.1"
+          }
         },
         "pretty-bytes": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-3.0.1.tgz",
-          "integrity": "sha1-J9AAjXeAY6C0gRuzXHnxvV1fvM8="
+          "integrity": "sha1-J9AAjXeAY6C0gRuzXHnxvV1fvM8=",
+          "requires": {
+            "number-is-nan": "1.0.1"
+          }
         },
         "strip-ansi": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8="
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "requires": {
+            "ansi-regex": "2.1.1"
+          }
         },
         "supports-color": {
           "version": "2.0.0",
@@ -668,7 +934,12 @@
       "version": "2.1.4",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
       "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
-      "optional": true
+      "optional": true,
+      "requires": {
+        "asynckit": "0.4.0",
+        "combined-stream": "1.0.5",
+        "mime-types": "2.1.15"
+      }
     },
     "fs.realpath": {
       "version": "1.0.0",
@@ -679,7 +950,10 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.2.tgz",
       "integrity": "sha1-hHIkZ3rbiHDWeSV+0ziP22HkAQU=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "globule": "1.2.0"
+      }
     },
     "get-stdin": {
       "version": "4.0.1",
@@ -696,6 +970,9 @@
       "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
       "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
       "optional": true,
+      "requires": {
+        "assert-plus": "1.0.0"
+      },
       "dependencies": {
         "assert-plus": {
           "version": "1.0.0",
@@ -709,6 +986,11 @@
       "version": "3.1.21",
       "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
       "integrity": "sha1-0p4KBV3qUTj00H7UDomC6DwgZs0=",
+      "requires": {
+        "graceful-fs": "1.2.3",
+        "inherits": "1.0.2",
+        "minimatch": "0.2.14"
+      },
       "dependencies": {
         "inherits": {
           "version": "1.0.2",
@@ -722,12 +1004,25 @@
       "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.0.tgz",
       "integrity": "sha1-HcScaCLdnoovoAuiopUAboZkvQk=",
       "dev": true,
+      "requires": {
+        "glob": "7.1.2",
+        "lodash": "4.17.4",
+        "minimatch": "3.0.4"
+      },
       "dependencies": {
         "glob": {
           "version": "7.1.2",
           "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
           "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-          "dev": 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"
+          }
         },
         "lodash": {
           "version": "4.17.4",
@@ -739,7 +1034,10 @@
           "version": "3.0.4",
           "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
           "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-          "dev": true
+          "dev": true,
+          "requires": {
+            "brace-expansion": "1.1.8"
+          }
         }
       }
     },
@@ -757,6 +1055,24 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/grunt/-/grunt-1.0.1.tgz",
       "integrity": "sha1-6HeHZOlEsY8yuw8QuQeEdcnftWs=",
+      "requires": {
+        "coffee-script": "1.10.0",
+        "dateformat": "1.0.12",
+        "eventemitter2": "0.4.14",
+        "exit": "0.1.2",
+        "findup-sync": "0.3.0",
+        "glob": "7.0.6",
+        "grunt-cli": "1.2.0",
+        "grunt-known-options": "1.1.0",
+        "grunt-legacy-log": "1.0.0",
+        "grunt-legacy-util": "1.0.0",
+        "iconv-lite": "0.4.18",
+        "js-yaml": "3.5.5",
+        "minimatch": "3.0.4",
+        "nopt": "3.0.6",
+        "path-is-absolute": "1.0.1",
+        "rimraf": "2.2.8"
+      },
       "dependencies": {
         "ansi-regex": {
           "version": "2.1.1",
@@ -771,7 +1087,10 @@
         "argparse": {
           "version": "1.0.9",
           "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz",
-          "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY="
+          "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=",
+          "requires": {
+            "sprintf-js": "1.0.3"
+          }
         },
         "async": {
           "version": "1.5.2",
@@ -781,7 +1100,14 @@
         "chalk": {
           "version": "1.1.3",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg="
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "requires": {
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
+          }
         },
         "coffee-script": {
           "version": "1.10.0",
@@ -796,7 +1122,11 @@
         "dateformat": {
           "version": "1.0.12",
           "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz",
-          "integrity": "sha1-nxJLZ1lMk3/3BpMuSmQsyo27/uk="
+          "integrity": "sha1-nxJLZ1lMk3/3BpMuSmQsyo27/uk=",
+          "requires": {
+            "get-stdin": "4.0.1",
+            "meow": "3.7.0"
+          }
         },
         "esprima": {
           "version": "2.7.3",
@@ -807,33 +1137,68 @@
           "version": "0.3.0",
           "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.3.0.tgz",
           "integrity": "sha1-N5MKpdgWt3fANEXhlmzGeQpMCxY=",
+          "requires": {
+            "glob": "5.0.15"
+          },
           "dependencies": {
             "glob": {
               "version": "5.0.15",
               "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-              "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E="
+              "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
+              "requires": {
+                "inflight": "1.0.6",
+                "inherits": "2.0.3",
+                "minimatch": "3.0.4",
+                "once": "1.4.0",
+                "path-is-absolute": "1.0.1"
+              }
             }
           }
         },
         "glob": {
           "version": "7.0.6",
           "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz",
-          "integrity": "sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo="
+          "integrity": "sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo=",
+          "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"
+          }
         },
         "grunt-cli": {
           "version": "1.2.0",
           "resolved": "https://registry.npmjs.org/grunt-cli/-/grunt-cli-1.2.0.tgz",
-          "integrity": "sha1-VisRnrsGndtGSs4oRVAb6Xs1tqg="
+          "integrity": "sha1-VisRnrsGndtGSs4oRVAb6Xs1tqg=",
+          "requires": {
+            "findup-sync": "0.3.0",
+            "grunt-known-options": "1.1.0",
+            "nopt": "3.0.6",
+            "resolve": "1.1.7"
+          }
         },
         "grunt-legacy-log": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-1.0.0.tgz",
-          "integrity": "sha1-+4bxgJhHvAfcR4Q/ns1srLYt8tU="
+          "integrity": "sha1-+4bxgJhHvAfcR4Q/ns1srLYt8tU=",
+          "requires": {
+            "colors": "1.1.2",
+            "grunt-legacy-log-utils": "1.0.0",
+            "hooker": "0.2.3",
+            "lodash": "3.10.1",
+            "underscore.string": "3.2.3"
+          }
         },
         "grunt-legacy-log-utils": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/grunt-legacy-log-utils/-/grunt-legacy-log-utils-1.0.0.tgz",
           "integrity": "sha1-p7ji0Ps1taUPSvmG/BEnSevJbz0=",
+          "requires": {
+            "chalk": "1.1.3",
+            "lodash": "4.3.0"
+          },
           "dependencies": {
             "lodash": {
               "version": "4.3.0",
@@ -846,6 +1211,15 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-1.0.0.tgz",
           "integrity": "sha1-OGqnjcbtUJhsKxiVcmWxtIq7m4Y=",
+          "requires": {
+            "async": "1.5.2",
+            "exit": "0.1.2",
+            "getobject": "0.1.0",
+            "hooker": "0.2.3",
+            "lodash": "4.3.0",
+            "underscore.string": "3.2.3",
+            "which": "1.2.14"
+          },
           "dependencies": {
             "lodash": {
               "version": "4.3.0",
@@ -857,7 +1231,10 @@
         "has-ansi": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-          "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE="
+          "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+          "requires": {
+            "ansi-regex": "2.1.1"
+          }
         },
         "iconv-lite": {
           "version": "0.4.18",
@@ -867,7 +1244,11 @@
         "js-yaml": {
           "version": "3.5.5",
           "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.5.5.tgz",
-          "integrity": "sha1-A3fDgBfKvHMisNH7zSWkkWQfL74="
+          "integrity": "sha1-A3fDgBfKvHMisNH7zSWkkWQfL74=",
+          "requires": {
+            "argparse": "1.0.9",
+            "esprima": "2.7.3"
+          }
         },
         "lodash": {
           "version": "3.10.1",
@@ -877,17 +1258,26 @@
         "minimatch": {
           "version": "3.0.4",
           "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-          "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="
+          "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+          "requires": {
+            "brace-expansion": "1.1.8"
+          }
         },
         "nopt": {
           "version": "3.0.6",
           "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
-          "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k="
+          "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
+          "requires": {
+            "abbrev": "1.1.0"
+          }
         },
         "strip-ansi": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8="
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "requires": {
+            "ansi-regex": "2.1.1"
+          }
         },
         "supports-color": {
           "version": "2.0.0",
@@ -902,7 +1292,10 @@
         "which": {
           "version": "1.2.14",
           "resolved": "https://registry.npmjs.org/which/-/which-1.2.14.tgz",
-          "integrity": "sha1-mofEN48D6CfOyvGs31bHNsAcFOU="
+          "integrity": "sha1-mofEN48D6CfOyvGs31bHNsAcFOU=",
+          "requires": {
+            "isexe": "2.0.0"
+          }
         }
       }
     },
@@ -910,6 +1303,10 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/grunt-contrib-clean/-/grunt-contrib-clean-1.0.0.tgz",
       "integrity": "sha1-ay7ZQRfix//jLuBFeMlv5GJam20=",
+      "requires": {
+        "async": "1.5.2",
+        "rimraf": "2.6.1"
+      },
       "dependencies": {
         "async": {
           "version": "1.5.2",
@@ -919,24 +1316,43 @@
         "glob": {
           "version": "7.1.2",
           "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ=="
+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+          "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"
+          }
         },
         "minimatch": {
           "version": "3.0.4",
           "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-          "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="
+          "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+          "requires": {
+            "brace-expansion": "1.1.8"
+          }
         },
         "rimraf": {
           "version": "2.6.1",
           "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz",
-          "integrity": "sha1-wjOOxkPfeht/5cVPqG9XQopV8z0="
+          "integrity": "sha1-wjOOxkPfeht/5cVPqG9XQopV8z0=",
+          "requires": {
+            "glob": "7.1.2"
+          }
         }
       }
     },
     "grunt-contrib-compress": {
       "version": "0.13.0",
       "resolved": "https://registry.npmjs.org/grunt-contrib-compress/-/grunt-contrib-compress-0.13.0.tgz",
-      "integrity": "sha1-x16V7f9/Gf0iudn4vLFkjHPYTXA="
+      "integrity": "sha1-x16V7f9/Gf0iudn4vLFkjHPYTXA=",
+      "requires": {
+        "archiver": "0.13.1",
+        "chalk": "0.5.1",
+        "prettysize": "0.0.3"
+      }
     },
     "grunt-contrib-concat": {
       "version": "0.3.0",
@@ -947,6 +1363,10 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/grunt-contrib-copy/-/grunt-contrib-copy-1.0.0.tgz",
       "integrity": "sha1-cGDGWB6QS4qw0A8HbgqPbj58NXM=",
+      "requires": {
+        "chalk": "1.1.3",
+        "file-sync-cmp": "0.1.1"
+      },
       "dependencies": {
         "ansi-regex": {
           "version": "2.1.1",
@@ -961,17 +1381,30 @@
         "chalk": {
           "version": "1.1.3",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg="
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "requires": {
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
+          }
         },
         "has-ansi": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-          "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE="
+          "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+          "requires": {
+            "ansi-regex": "2.1.1"
+          }
         },
         "strip-ansi": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8="
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "requires": {
+            "ansi-regex": "2.1.1"
+          }
         },
         "supports-color": {
           "version": "2.0.0",
@@ -984,6 +1417,11 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/grunt-contrib-cssmin/-/grunt-contrib-cssmin-1.0.2.tgz",
       "integrity": "sha1-FzTL09hMpzZHWLflj/GOUqpgu3Y=",
+      "requires": {
+        "chalk": "1.1.3",
+        "clean-css": "3.4.27",
+        "maxmin": "1.1.0"
+      },
       "dependencies": {
         "ansi-regex": {
           "version": "2.1.1",
@@ -998,17 +1436,30 @@
         "chalk": {
           "version": "1.1.3",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg="
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "requires": {
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
+          }
         },
         "has-ansi": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-          "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE="
+          "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+          "requires": {
+            "ansi-regex": "2.1.1"
+          }
         },
         "strip-ansi": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8="
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "requires": {
+            "ansi-regex": "2.1.1"
+          }
         },
         "supports-color": {
           "version": "2.0.0",
@@ -1022,6 +1473,11 @@
       "resolved": "https://registry.npmjs.org/grunt-contrib-jshint/-/grunt-contrib-jshint-1.0.0.tgz",
       "integrity": "sha1-MPQFpR3mVr+m6wKbmkZLn+AqQCo=",
       "dev": true,
+      "requires": {
+        "chalk": "1.1.3",
+        "hooker": "0.2.3",
+        "jshint": "2.9.5"
+      },
       "dependencies": {
         "ansi-regex": {
           "version": "2.1.1",
@@ -1039,19 +1495,32 @@
           "version": "1.1.3",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true
+          "dev": true,
+          "requires": {
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
+          }
         },
         "has-ansi": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
           "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-          "dev": true
+          "dev": true,
+          "requires": {
+            "ansi-regex": "2.1.1"
+          }
         },
         "strip-ansi": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true
+          "dev": true,
+          "requires": {
+            "ansi-regex": "2.1.1"
+          }
         },
         "supports-color": {
           "version": "2.0.0",
@@ -1065,6 +1534,12 @@
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/grunt-contrib-less/-/grunt-contrib-less-1.4.1.tgz",
       "integrity": "sha1-O73sC3XRLOqlXWKUNiXAsIYc328=",
+      "requires": {
+        "async": "2.5.0",
+        "chalk": "1.1.3",
+        "less": "2.7.2",
+        "lodash": "4.17.4"
+      },
       "dependencies": {
         "ansi-regex": {
           "version": "2.1.1",
@@ -1079,17 +1554,30 @@
         "async": {
           "version": "2.5.0",
           "resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz",
-          "integrity": "sha512-e+lJAJeNWuPCNyxZKOBdaJGyLGHugXVQtrAwtuAe2vhxTYxFTKE73p8JuTmdH0qdQZtDvI4dhJwjZc5zsfIsYw=="
+          "integrity": "sha512-e+lJAJeNWuPCNyxZKOBdaJGyLGHugXVQtrAwtuAe2vhxTYxFTKE73p8JuTmdH0qdQZtDvI4dhJwjZc5zsfIsYw==",
+          "requires": {
+            "lodash": "4.17.4"
+          }
         },
         "chalk": {
           "version": "1.1.3",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg="
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "requires": {
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
+          }
         },
         "has-ansi": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-          "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE="
+          "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+          "requires": {
+            "ansi-regex": "2.1.1"
+          }
         },
         "lodash": {
           "version": "4.17.4",
@@ -1099,7 +1587,10 @@
         "strip-ansi": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8="
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "requires": {
+            "ansi-regex": "2.1.1"
+          }
         },
         "supports-color": {
           "version": "2.0.0",
@@ -1112,6 +1603,13 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-2.0.0.tgz",
       "integrity": "sha1-jJlw1pCTbN5tJaoRk1Sb2SkBaTA=",
+      "requires": {
+        "chalk": "1.1.3",
+        "lodash.assign": "4.2.0",
+        "maxmin": "1.1.0",
+        "uglify-js": "2.7.5",
+        "uri-path": "1.0.0"
+      },
       "dependencies": {
         "ansi-regex": {
           "version": "2.1.1",
@@ -1131,12 +1629,22 @@
         "chalk": {
           "version": "1.1.3",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg="
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "requires": {
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
+          }
         },
         "has-ansi": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-          "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE="
+          "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+          "requires": {
+            "ansi-regex": "2.1.1"
+          }
         },
         "source-map": {
           "version": "0.5.6",
@@ -1146,7 +1654,10 @@
         "strip-ansi": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8="
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "requires": {
+            "ansi-regex": "2.1.1"
+          }
         },
         "supports-color": {
           "version": "2.0.0",
@@ -1156,7 +1667,13 @@
         "uglify-js": {
           "version": "2.7.5",
           "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.5.tgz",
-          "integrity": "sha1-RhLAx7qu4rp8SH3kkErhIgefLKg="
+          "integrity": "sha1-RhLAx7qu4rp8SH3kkErhIgefLKg=",
+          "requires": {
+            "async": "0.2.10",
+            "source-map": "0.5.6",
+            "uglify-to-browserify": "1.0.2",
+            "yargs": "3.10.0"
+          }
         }
       }
     },
@@ -1165,6 +1682,12 @@
       "resolved": "https://registry.npmjs.org/grunt-contrib-watch/-/grunt-contrib-watch-1.0.0.tgz",
       "integrity": "sha1-hKGnodar0m7VaEE0lscxM+mQAY8=",
       "dev": true,
+      "requires": {
+        "async": "1.5.2",
+        "gaze": "1.1.2",
+        "lodash": "3.10.1",
+        "tiny-lr": "0.2.1"
+      },
       "dependencies": {
         "async": {
           "version": "1.5.2",
@@ -1183,7 +1706,10 @@
     "grunt-jsdoc": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/grunt-jsdoc/-/grunt-jsdoc-1.1.0.tgz",
-      "integrity": "sha1-S87+YFh6ZGpbcg/pq/lMxIh/6FQ="
+      "integrity": "sha1-S87+YFh6ZGpbcg/pq/lMxIh/6FQ=",
+      "requires": {
+        "jsdoc": "3.5.4"
+      }
     },
     "grunt-known-options": {
       "version": "1.1.0",
@@ -1194,6 +1720,13 @@
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-0.1.3.tgz",
       "integrity": "sha1-7ClCboAwIa9ZAp+H0vnNczWgVTE=",
+      "requires": {
+        "colors": "0.6.2",
+        "grunt-legacy-log-utils": "0.1.1",
+        "hooker": "0.2.3",
+        "lodash": "2.4.2",
+        "underscore.string": "2.3.3"
+      },
       "dependencies": {
         "lodash": {
           "version": "2.4.2",
@@ -1211,6 +1744,11 @@
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/grunt-legacy-log-utils/-/grunt-legacy-log-utils-0.1.1.tgz",
       "integrity": "sha1-wHBrndkGThFvNvI/5OawSGcsD34=",
+      "requires": {
+        "colors": "0.6.2",
+        "lodash": "2.4.2",
+        "underscore.string": "2.3.3"
+      },
       "dependencies": {
         "lodash": {
           "version": "2.4.2",
@@ -1227,12 +1765,25 @@
     "grunt-legacy-util": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-0.2.0.tgz",
-      "integrity": "sha1-kzJIhNv343qf98Am3/RR2UqeVUs="
+      "integrity": "sha1-kzJIhNv343qf98Am3/RR2UqeVUs=",
+      "requires": {
+        "async": "0.1.22",
+        "exit": "0.1.2",
+        "getobject": "0.1.0",
+        "hooker": "0.2.3",
+        "lodash": "0.9.2",
+        "underscore.string": "2.2.1",
+        "which": "1.0.9"
+      }
     },
     "gzip-size": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-1.0.0.tgz",
-      "integrity": "sha1-Zs+LEBBHInuVus5uodoMF37Vwi8="
+      "integrity": "sha1-Zs+LEBBHInuVus5uodoMF37Vwi8=",
+      "requires": {
+        "browserify-zlib": "0.1.4",
+        "concat-stream": "1.6.0"
+      }
     },
     "har-schema": {
       "version": "1.0.5",
@@ -1244,18 +1795,31 @@
       "version": "4.2.1",
       "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz",
       "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=",
-      "optional": true
+      "optional": true,
+      "requires": {
+        "ajv": "4.11.8",
+        "har-schema": "1.0.5"
+      }
     },
     "has-ansi": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
-      "integrity": "sha1-hPJlqujA5qiKEtcCKJS3VoiUxi4="
+      "integrity": "sha1-hPJlqujA5qiKEtcCKJS3VoiUxi4=",
+      "requires": {
+        "ansi-regex": "0.2.1"
+      }
     },
     "hawk": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
       "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
-      "optional": true
+      "optional": true,
+      "requires": {
+        "boom": "2.10.1",
+        "cryptiles": "2.0.5",
+        "hoek": "2.16.3",
+        "sntp": "1.0.9"
+      }
     },
     "hoek": {
       "version": "2.16.3",
@@ -1277,12 +1841,25 @@
       "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz",
       "integrity": "sha1-mWwosZFRaovoZQGn15dX5ccMEGg=",
       "dev": true,
+      "requires": {
+        "domelementtype": "1.3.0",
+        "domhandler": "2.3.0",
+        "domutils": "1.5.1",
+        "entities": "1.0.0",
+        "readable-stream": "1.1.14"
+      },
       "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
+          "dev": true,
+          "requires": {
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "0.0.1",
+            "string_decoder": "0.10.31"
+          }
         }
       }
     },
@@ -1290,13 +1867,22 @@
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.3.1.tgz",
       "integrity": "sha1-GX4izevUGYWF6GlO9nhhl7ke2UI=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3",
+        "statuses": "1.3.1"
+      }
     },
     "http-signature": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
       "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
-      "optional": true
+      "optional": true,
+      "requires": {
+        "assert-plus": "0.2.0",
+        "jsprim": "1.4.0",
+        "sshpk": "1.13.1"
+      }
     },
     "iconv-lite": {
       "version": "0.2.11",
@@ -1312,12 +1898,19 @@
     "indent-string": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
-      "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA="
+      "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
+      "requires": {
+        "repeating": "2.0.1"
+      }
     },
     "inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk="
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "requires": {
+        "once": "1.4.0",
+        "wrappy": "1.0.2"
+      }
     },
     "inherits": {
       "version": "2.0.3",
@@ -1337,12 +1930,18 @@
     "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="
+      "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
+      "requires": {
+        "builtin-modules": "1.1.1"
+      }
     },
     "is-finite": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
-      "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko="
+      "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
+      "requires": {
+        "number-is-nan": "1.0.1"
+      }
     },
     "is-typedarray": {
       "version": "1.0.0",
@@ -1379,22 +1978,35 @@
     "jquery-form": {
       "version": "3.50.0",
       "resolved": "https://registry.npmjs.org/jquery-form/-/jquery-form-3.50.0.tgz",
-      "integrity": "sha1-18lptR4JThLaaZHrYf9a8l9ZeY8="
+      "integrity": "sha1-18lptR4JThLaaZHrYf9a8l9ZeY8=",
+      "requires": {
+        "jquery": "2.2.4"
+      }
     },
     "jquery-validation": {
       "version": "1.15.1",
       "resolved": "https://registry.npmjs.org/jquery-validation/-/jquery-validation-1.15.1.tgz",
-      "integrity": "sha1-fBZXEbYR9tzloSrj5IVcELWj4zE="
+      "integrity": "sha1-fBZXEbYR9tzloSrj5IVcELWj4zE=",
+      "requires": {
+        "jquery": "2.2.4"
+      }
     },
     "js-yaml": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-2.0.5.tgz",
-      "integrity": "sha1-olrmUJmZ6X3yeMZxnaEb0Gh3Q6g="
+      "integrity": "sha1-olrmUJmZ6X3yeMZxnaEb0Gh3Q6g=",
+      "requires": {
+        "argparse": "0.1.16",
+        "esprima": "1.0.4"
+      }
     },
     "js2xmlparser": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-1.0.0.tgz",
-      "integrity": "sha1-WhcPLo1kds5FQF4EgjJCUTeC/jA="
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-3.0.0.tgz",
+      "integrity": "sha1-P7YOqgicVED5MZ9RdgzNB+JJlzM=",
+      "requires": {
+        "xmlcreate": "1.0.2"
+      }
     },
     "jsbn": {
       "version": "0.1.1",
@@ -1403,9 +2015,23 @@
       "optional": true
     },
     "jsdoc": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-3.4.3.tgz",
-      "integrity": "sha1-5XQNYUXGgfZnnmwXeDqI292XzNM=",
+      "version": "3.5.4",
+      "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-3.5.4.tgz",
+      "integrity": "sha512-VmTw0J+2L16IxAe0JSDSAcH0F+DbZxaj8wN1AjHtKMQU/hO0ciIl5ZE93XqrrFIbknobuqHKJCXZj6+Hk57MjA==",
+      "requires": {
+        "babylon": "7.0.0-beta.21",
+        "bluebird": "3.5.0",
+        "catharsis": "0.8.9",
+        "escape-string-regexp": "1.0.5",
+        "js2xmlparser": "3.0.0",
+        "klaw": "2.0.0",
+        "marked": "0.3.6",
+        "mkdirp": "0.5.1",
+        "requizzle": "0.2.1",
+        "strip-json-comments": "2.0.1",
+        "taffydb": "2.6.2",
+        "underscore": "1.8.3"
+      },
       "dependencies": {
         "underscore": {
           "version": "1.8.3",
@@ -1424,6 +2050,16 @@
       "resolved": "https://registry.npmjs.org/jshint/-/jshint-2.9.5.tgz",
       "integrity": "sha1-HnJSkVzmgbQIJ+4UJIxG006apiw=",
       "dev": true,
+      "requires": {
+        "cli": "1.0.1",
+        "console-browserify": "1.1.0",
+        "exit": "0.1.2",
+        "htmlparser2": "3.8.3",
+        "lodash": "3.7.0",
+        "minimatch": "3.0.4",
+        "shelljs": "0.3.0",
+        "strip-json-comments": "1.0.4"
+      },
       "dependencies": {
         "lodash": {
           "version": "3.7.0",
@@ -1435,7 +2071,10 @@
           "version": "3.0.4",
           "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
           "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-          "dev": true
+          "dev": true,
+          "requires": {
+            "brace-expansion": "1.1.8"
+          }
         },
         "strip-json-comments": {
           "version": "1.0.4",
@@ -1455,7 +2094,10 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
       "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
-      "optional": true
+      "optional": true,
+      "requires": {
+        "jsonify": "0.0.0"
+      }
     },
     "json-stringify-safe": {
       "version": "5.0.1",
@@ -1474,6 +2116,12 @@
       "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz",
       "integrity": "sha1-o7h+QCmNjDgFUtjMdiigu5WiKRg=",
       "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",
@@ -1486,18 +2134,23 @@
     "kind-of": {
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ="
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "requires": {
+        "is-buffer": "1.1.5"
+      }
     },
     "klaw": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz",
-      "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/klaw/-/klaw-2.0.0.tgz",
+      "integrity": "sha1-WcEo4Nxc5BAgEVEZTuucv4WGUPY=",
+      "requires": {
+        "graceful-fs": "4.1.11"
+      },
       "dependencies": {
         "graceful-fs": {
           "version": "4.1.11",
           "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-          "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
-          "optional": true
+          "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
         }
       }
     },
@@ -1509,12 +2162,25 @@
     "lazystream": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-0.1.0.tgz",
-      "integrity": "sha1-GyXWPHcqTCDwpe0KnXf0hLbhaSA="
+      "integrity": "sha1-GyXWPHcqTCDwpe0KnXf0hLbhaSA=",
+      "requires": {
+        "readable-stream": "1.0.34"
+      }
     },
     "less": {
       "version": "2.7.2",
       "resolved": "https://registry.npmjs.org/less/-/less-2.7.2.tgz",
       "integrity": "sha1-No1sxz4fsDmBGDKAkYdDxdz5s98=",
+      "requires": {
+        "errno": "0.1.4",
+        "graceful-fs": "4.1.11",
+        "image-size": "0.5.5",
+        "mime": "1.3.6",
+        "mkdirp": "0.5.1",
+        "promise": "7.3.1",
+        "request": "2.81.0",
+        "source-map": "0.5.6"
+      },
       "dependencies": {
         "graceful-fs": {
           "version": "4.1.11",
@@ -1540,6 +2206,13 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
       "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "parse-json": "2.2.0",
+        "pify": "2.3.0",
+        "pinkie-promise": "2.0.1",
+        "strip-bom": "2.0.0"
+      },
       "dependencies": {
         "graceful-fs": {
           "version": "4.1.11",
@@ -1566,7 +2239,11 @@
     "loud-rejection": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
-      "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8="
+      "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
+      "requires": {
+        "currently-unhandled": "0.4.1",
+        "signal-exit": "3.0.2"
+      }
     },
     "lru-cache": {
       "version": "2.7.3",
@@ -1587,6 +2264,12 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/maxmin/-/maxmin-1.1.0.tgz",
       "integrity": "sha1-cTZehKmd2Piz99X94vANHn9zvmE=",
+      "requires": {
+        "chalk": "1.1.3",
+        "figures": "1.7.0",
+        "gzip-size": "1.0.0",
+        "pretty-bytes": "1.0.4"
+      },
       "dependencies": {
         "ansi-regex": {
           "version": "2.1.1",
@@ -1601,17 +2284,30 @@
         "chalk": {
           "version": "1.1.3",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg="
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "requires": {
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
+          }
         },
         "has-ansi": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-          "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE="
+          "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+          "requires": {
+            "ansi-regex": "2.1.1"
+          }
         },
         "strip-ansi": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8="
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "requires": {
+            "ansi-regex": "2.1.1"
+          }
         },
         "supports-color": {
           "version": "2.0.0",
@@ -1629,7 +2325,19 @@
     "meow": {
       "version": "3.7.0",
       "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
-      "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs="
+      "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
+      "requires": {
+        "camelcase-keys": "2.1.0",
+        "decamelize": "1.2.0",
+        "loud-rejection": "1.6.0",
+        "map-obj": "1.0.1",
+        "minimist": "1.2.0",
+        "normalize-package-data": "2.4.0",
+        "object-assign": "4.1.1",
+        "read-pkg-up": "1.0.1",
+        "redent": "1.0.0",
+        "trim-newlines": "1.0.0"
+      }
     },
     "mime": {
       "version": "1.3.6",
@@ -1645,12 +2353,19 @@
     "mime-types": {
       "version": "2.1.15",
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz",
-      "integrity": "sha1-pOv1BkCUVpI3uM9wBGd20J/JKu0="
+      "integrity": "sha1-pOv1BkCUVpI3uM9wBGd20J/JKu0=",
+      "requires": {
+        "mime-db": "1.27.0"
+      }
     },
     "minimatch": {
       "version": "0.2.14",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
-      "integrity": "sha1-x054BXT2PG+aCQ6Q775u9TpqdWo="
+      "integrity": "sha1-x054BXT2PG+aCQ6Q775u9TpqdWo=",
+      "requires": {
+        "lru-cache": "2.7.3",
+        "sigmund": "1.0.1"
+      }
     },
     "minimist": {
       "version": "1.2.0",
@@ -1661,6 +2376,9 @@
       "version": "0.5.1",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
       "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+      "requires": {
+        "minimist": "0.0.8"
+      },
       "dependencies": {
         "minimist": {
           "version": "0.0.8",
@@ -1688,12 +2406,21 @@
     "nopt": {
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz",
-      "integrity": "sha1-bd0hvSoxQXuScn3Vhfim83YI6+4="
+      "integrity": "sha1-bd0hvSoxQXuScn3Vhfim83YI6+4=",
+      "requires": {
+        "abbrev": "1.1.0"
+      }
     },
     "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=="
+      "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==",
+      "requires": {
+        "hosted-git-info": "2.5.0",
+        "is-builtin-module": "1.0.0",
+        "semver": "5.3.0",
+        "validate-npm-package-license": "3.0.1"
+      }
     },
     "number-is-nan": {
       "version": "1.0.1",
@@ -1715,12 +2442,18 @@
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
       "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "ee-first": "1.1.1"
+      }
     },
     "once": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E="
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "requires": {
+        "wrappy": "1.0.2"
+      }
     },
     "pako": {
       "version": "0.2.9",
@@ -1730,7 +2463,10 @@
     "parse-json": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck="
+      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+      "requires": {
+        "error-ex": "1.3.1"
+      }
     },
     "parseurl": {
       "version": "1.3.1",
@@ -1741,7 +2477,10 @@
     "path-exists": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-      "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s="
+      "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
+      "requires": {
+        "pinkie-promise": "2.0.1"
+      }
     },
     "path-is-absolute": {
       "version": "1.0.1",
@@ -1752,6 +2491,11 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
       "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "pify": "2.3.0",
+        "pinkie-promise": "2.0.1"
+      },
       "dependencies": {
         "graceful-fs": {
           "version": "4.1.11",
@@ -1779,12 +2523,19 @@
     "pinkie-promise": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o="
+      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
+      "requires": {
+        "pinkie": "2.0.4"
+      }
     },
     "pretty-bytes": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-1.0.4.tgz",
-      "integrity": "sha1-CiLoIQYJrTVUL4yNXSFZr/B1HIQ="
+      "integrity": "sha1-CiLoIQYJrTVUL4yNXSFZr/B1HIQ=",
+      "requires": {
+        "get-stdin": "4.0.1",
+        "meow": "3.7.0"
+      }
     },
     "prettysize": {
       "version": "0.0.3",
@@ -1800,7 +2551,10 @@
       "version": "7.3.1",
       "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
       "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==",
-      "optional": true
+      "optional": true,
+      "requires": {
+        "asap": "2.0.5"
+      }
     },
     "prr": {
       "version": "0.0.0",
@@ -1825,6 +2579,11 @@
       "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.1.7.tgz",
       "integrity": "sha1-rf6s4uT7MJgFgBTQjActzFl1h3Q=",
       "dev": true,
+      "requires": {
+        "bytes": "2.4.0",
+        "iconv-lite": "0.4.13",
+        "unpipe": "1.0.0"
+      },
       "dependencies": {
         "bytes": {
           "version": "2.4.0",
@@ -1843,22 +2602,41 @@
     "read-pkg": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-      "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg="
+      "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
+      "requires": {
+        "load-json-file": "1.1.0",
+        "normalize-package-data": "2.4.0",
+        "path-type": "1.1.0"
+      }
     },
     "read-pkg-up": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-      "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI="
+      "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
+      "requires": {
+        "find-up": "1.1.2",
+        "read-pkg": "1.1.0"
+      }
     },
     "readable-stream": {
       "version": "1.0.34",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-      "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw="
+      "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+      "requires": {
+        "core-util-is": "1.0.2",
+        "inherits": "2.0.3",
+        "isarray": "0.0.1",
+        "string_decoder": "0.10.31"
+      }
     },
     "redent": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
-      "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94="
+      "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
+      "requires": {
+        "indent-string": "2.1.0",
+        "strip-indent": "1.0.1"
+      }
     },
     "repeat-string": {
       "version": "1.6.1",
@@ -1868,18 +2646,48 @@
     "repeating": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
-      "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo="
+      "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
+      "requires": {
+        "is-finite": "1.0.2"
+      }
     },
     "request": {
       "version": "2.81.0",
       "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
       "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=",
-      "optional": 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.1.1",
+        "stringstream": "0.0.5",
+        "tough-cookie": "2.3.2",
+        "tunnel-agent": "0.6.0",
+        "uuid": "3.1.0"
+      }
     },
     "requizzle": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/requizzle/-/requizzle-0.2.1.tgz",
       "integrity": "sha1-aUPDUwxNmn5G8c3dUcFY/GcM294=",
+      "requires": {
+        "underscore": "1.6.0"
+      },
       "dependencies": {
         "underscore": {
           "version": "1.6.0",
@@ -1896,7 +2704,10 @@
     "right-align": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
-      "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8="
+      "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=",
+      "requires": {
+        "align-text": "0.1.4"
+      }
     },
     "rimraf": {
       "version": "2.2.8",
@@ -1933,17 +2744,26 @@
       "version": "1.0.9",
       "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
       "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
-      "optional": true
+      "optional": true,
+      "requires": {
+        "hoek": "2.16.3"
+      }
     },
     "source-map": {
       "version": "0.4.4",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
-      "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s="
+      "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
+      "requires": {
+        "amdefine": "1.0.1"
+      }
     },
     "spdx-correct": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz",
-      "integrity": "sha1-SzBz2TP/UfORLwOsVRlJikFQ20A="
+      "integrity": "sha1-SzBz2TP/UfORLwOsVRlJikFQ20A=",
+      "requires": {
+        "spdx-license-ids": "1.2.2"
+      }
     },
     "spdx-expression-parse": {
       "version": "1.0.4",
@@ -1965,6 +2785,16 @@
       "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
       "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=",
       "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",
+        "jsbn": "0.1.1",
+        "tweetnacl": "0.14.5"
+      },
       "dependencies": {
         "assert-plus": {
           "version": "1.0.0",
@@ -1994,17 +2824,26 @@
     "strip-ansi": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
-      "integrity": "sha1-JfSOoiynkYfzF0pNuHWTR7sSYiA="
+      "integrity": "sha1-JfSOoiynkYfzF0pNuHWTR7sSYiA=",
+      "requires": {
+        "ansi-regex": "0.2.1"
+      }
     },
     "strip-bom": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-      "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4="
+      "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
+      "requires": {
+        "is-utf8": "0.2.1"
+      }
     },
     "strip-indent": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
-      "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI="
+      "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
+      "requires": {
+        "get-stdin": "4.0.1"
+      }
     },
     "strip-json-comments": {
       "version": "2.0.1",
@@ -2024,13 +2863,27 @@
     "tar-stream": {
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.1.5.tgz",
-      "integrity": "sha1-vpIYwTDCACnhB7D5Z/sj3gV50Tw="
+      "integrity": "sha1-vpIYwTDCACnhB7D5Z/sj3gV50Tw=",
+      "requires": {
+        "bl": "0.9.5",
+        "end-of-stream": "1.4.0",
+        "readable-stream": "1.0.34",
+        "xtend": "4.0.1"
+      }
     },
     "tiny-lr": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/tiny-lr/-/tiny-lr-0.2.1.tgz",
       "integrity": "sha1-s/26gC5dVqM8L28QeUsy5Hescp0=",
       "dev": true,
+      "requires": {
+        "body-parser": "1.14.2",
+        "debug": "2.2.0",
+        "faye-websocket": "0.10.0",
+        "livereload-js": "2.2.2",
+        "parseurl": "1.3.1",
+        "qs": "5.1.0"
+      },
       "dependencies": {
         "qs": {
           "version": "5.1.0",
@@ -2044,7 +2897,10 @@
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz",
       "integrity": "sha1-8IH3bkyFcg5sN6X6ztc3FQ2EByo=",
-      "optional": true
+      "optional": true,
+      "requires": {
+        "punycode": "1.4.1"
+      }
     },
     "trim-newlines": {
       "version": "1.0.0",
@@ -2055,7 +2911,10 @@
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
       "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-      "optional": true
+      "optional": true,
+      "requires": {
+        "safe-buffer": "5.1.1"
+      }
     },
     "tweetnacl": {
       "version": "0.14.5",
@@ -2067,7 +2926,11 @@
       "version": "1.6.15",
       "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.15.tgz",
       "integrity": "sha1-yrEPtJCeRByChC6v4a1kbIGARBA=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "media-typer": "0.3.0",
+        "mime-types": "2.1.15"
+      }
     },
     "typedarray": {
       "version": "0.0.6",
@@ -2078,6 +2941,12 @@
       "version": "2.6.4",
       "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.6.4.tgz",
       "integrity": "sha1-ZeovswWck5RpLxX+2HwrNsFrmt8=",
+      "requires": {
+        "async": "0.2.10",
+        "source-map": "0.5.7",
+        "uglify-to-browserify": "1.0.2",
+        "yargs": "3.10.0"
+      },
       "dependencies": {
         "async": {
           "version": "0.2.10",
@@ -2085,9 +2954,9 @@
           "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E="
         },
         "source-map": {
-          "version": "0.5.6",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
-          "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI="
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
         }
       }
     },
@@ -2105,6 +2974,9 @@
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/underscore-contrib/-/underscore-contrib-0.3.0.tgz",
       "integrity": "sha1-ZltmwkeD+PorGMn4y7Dix9SMJsc=",
+      "requires": {
+        "underscore": "1.6.0"
+      },
       "dependencies": {
         "underscore": {
           "version": "1.6.0",
@@ -2143,19 +3015,29 @@
     "validate-npm-package-license": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
-      "integrity": "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w="
+      "integrity": "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w=",
+      "requires": {
+        "spdx-correct": "1.0.2",
+        "spdx-expression-parse": "1.0.4"
+      }
     },
     "verror": {
       "version": "1.3.6",
       "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz",
       "integrity": "sha1-z/XfEpRtKX0rqu+qJoniW+AcAFw=",
-      "optional": true
+      "optional": true,
+      "requires": {
+        "extsprintf": "1.0.2"
+      }
     },
     "websocket-driver": {
       "version": "0.6.5",
       "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.5.tgz",
       "integrity": "sha1-XLJVbOuF9Dc8bYI4qmkchFThOjY=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "websocket-extensions": "0.1.1"
+      }
     },
     "websocket-extensions": {
       "version": "0.1.1",
@@ -2183,6 +3065,11 @@
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
+    "xmlcreate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/xmlcreate/-/xmlcreate-1.0.2.tgz",
+      "integrity": "sha1-+mv3YqYKQT+z3Y9LA8WyaSONMI8="
+    },
     "xtend": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
@@ -2192,6 +3079,12 @@
       "version": "3.10.0",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
       "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
+      "requires": {
+        "camelcase": "1.2.1",
+        "cliui": "2.1.0",
+        "decamelize": "1.2.0",
+        "window-size": "0.1.0"
+      },
       "dependencies": {
         "camelcase": {
           "version": "1.2.1",
@@ -2204,6 +3097,11 @@
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-0.5.2.tgz",
       "integrity": "sha1-Mty8UG0Nq00hNyYlvX66rDwv/1Y=",
+      "requires": {
+        "compress-commons": "0.2.9",
+        "lodash": "3.2.0",
+        "readable-stream": "1.0.34"
+      },
       "dependencies": {
         "lodash": {
           "version": "3.2.0",

From db5df381b86a03dbfa5a2f728912d89b78489e09 Mon Sep 17 00:00:00 2001
From: santiago carello <santiagocarello95@gmail.com>
Date: Tue, 29 Aug 2017 16:30:34 -0300
Subject: [PATCH 04/14] add parametrizado

---
 app/View/Estudiantes/add.ctp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/View/Estudiantes/add.ctp b/app/View/Estudiantes/add.ctp
index 81b7a93..da39ef2 100755
--- a/app/View/Estudiantes/add.ctp
+++ b/app/View/Estudiantes/add.ctp
@@ -6,7 +6,7 @@ $this->Html->script('estudiante.form-app', array('inline' => false));
 
 <div class="row form-app">
   <div class="col-md-12 page-title">
-    <h3>Agregar estudiante</h3>
+    <h3>Agregar <?php echo strtolower($this->Plataforma->obtenerEncuestado())?> </h3>
   </div>
 
   <?php

From e7a1f992a1b46e40eeb66bce51fbabf4975cd1dc Mon Sep 17 00:00:00 2001
From: santiago carello <santiagocarello95@gmail.com>
Date: Tue, 29 Aug 2017 16:32:29 -0300
Subject: [PATCH 05/14] add

---
 app/View/Estudiantes/add.ctp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/View/Estudiantes/add.ctp b/app/View/Estudiantes/add.ctp
index da39ef2..e082480 100755
--- a/app/View/Estudiantes/add.ctp
+++ b/app/View/Estudiantes/add.ctp
@@ -17,7 +17,7 @@ $this->Html->script('estudiante.form-app', array('inline' => false));
 
   <fieldset class="col-md-12">
     <div class="form-group">
-      <label for="legajo" class="control-label">Legajo</label>
+      <label for="legajo" class="control-label"><?php echo $this->Plataforma->obtenerID() ?></label>
       <div class="control-input">
         <input
           name="data[Estudiante][legajo]"
@@ -58,7 +58,7 @@ $this->Html->script('estudiante.form-app', array('inline' => false));
     </div>
 
     <div class="form-group">
-      <label for="tutor" class="control-label">Tutor</label>
+      <label for="tutor" class="control-label"><?php echo $this->Plataforma->obtenerUsuario() ?></label>
       <div class="control-input">
         <?php
         echo $this->Form->input('user_id', array(

From 1b56a361785dfb1cb9bf79caa5af19dc39dfab64 Mon Sep 17 00:00:00 2001
From: Jorge Alberto Cricelli <jacricelli@gmail.com>
Date: Fri, 1 Sep 2017 20:56:52 -0300
Subject: [PATCH 06/14] Mostrar aviso al usuario al regenerar la encuesta

Referencia: #24
---
 app/Controller/EncuestasController.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Controller/EncuestasController.php b/app/Controller/EncuestasController.php
index 168760e..5c1640a 100755
--- a/app/Controller/EncuestasController.php
+++ b/app/Controller/EncuestasController.php
@@ -29,6 +29,7 @@ public function regenerate($id = null) {
 		$estudiante = $this->Encuesta->Estudiante->read();
 		$this->Encuesta->regenerar($this->Encuesta->Estudiante->id);
 
+		$this->Flash->success('La encuesta ha sido regenerada correctamente.');
 		return $this->redirect(array('action' => 'index', $id));
 	}
 

From 2020847b9b89d64d1f2b5001fae84b86f906bd39 Mon Sep 17 00:00:00 2001
From: Jorge Alberto Cricelli <jacricelli@gmail.com>
Date: Fri, 1 Sep 2017 20:58:26 -0300
Subject: [PATCH 07/14] =?UTF-8?q?Incrementar=20el=20tama=C3=B1o=20del=20in?=
 =?UTF-8?q?dicador?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Referencia: #24
---
 app/webroot/less/encuesta.less | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/webroot/less/encuesta.less b/app/webroot/less/encuesta.less
index 038fb24..1f5a7d7 100644
--- a/app/webroot/less/encuesta.less
+++ b/app/webroot/less/encuesta.less
@@ -49,6 +49,10 @@
     font-size: 160%;
     font-weight: initial;
     padding-right: 20px;
+
+    .glyphicon {
+      font-size: 24px;
+    }
   }
 
   /* Ayuda */

From 158ea5691f44eb914878eda77e31f25da29bae4c Mon Sep 17 00:00:00 2001
From: Jorge Alberto Cricelli <jacricelli@gmail.com>
Date: Fri, 1 Sep 2017 23:17:02 -0300
Subject: [PATCH 08/14] =?UTF-8?q?Agregar=20librer=C3=ADa=20Plataforma?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Queda deprecado el ayudante Plataforma en favor de la librería dado
que es necesario algo que pueda utilizarse en toda la aplicación.

Referencia: #31
---
 app/Config/bootstrap.php             |  4 +--
 app/Lib/Plataforma.php               | 44 ++++++++++++++++++++++++++++
 app/View/Helper/PlataformaHelper.php |  3 +-
 app/View/Layouts/default.ctp         |  8 ++++-
 4 files changed, 55 insertions(+), 4 deletions(-)
 create mode 100644 app/Lib/Plataforma.php

diff --git a/app/Config/bootstrap.php b/app/Config/bootstrap.php
index d775d68..1d48175 100755
--- a/app/Config/bootstrap.php
+++ b/app/Config/bootstrap.php
@@ -128,6 +128,6 @@
 }
 
 /**
- * Especifica si la instalación corresponde a la versión de Graduados.
+ * Plataforma
  */
-//Configure::write('Plataforma.Graduados', false);
+App::uses('Plataforma', 'Lib');
diff --git a/app/Lib/Plataforma.php b/app/Lib/Plataforma.php
new file mode 100644
index 0000000..0cea3b4
--- /dev/null
+++ b/app/Lib/Plataforma.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Dependencias
+ */
+App::uses('Configure', 'Core');
+
+/**
+ * Plataforma
+ */
+class Plataforma {
+
+/**
+ * Almacena la versión de la plataforma.
+ *
+ * @var string
+ */
+	private static $__version = 'master';
+
+/**
+ * Obtiene la versión de la plataforma.
+ *
+ * @return string
+ */
+	public function obtenerVersion() {
+		$archivo = APP . 'Config' . DS . 'VERSION.txt';
+		if (file_exists($archivo)) {
+			$hash = file_get_contents($archivo);
+			if (!empty($hash)) {
+				self::$__version = substr($hash, 0, 7);
+			}
+		}
+
+		return self::$__version;
+	}
+
+/**
+ * Comprueba si la instalación corresponde a la versión de Tutorías.
+ *
+ * @return bool
+ */
+	public static function esTutorias() {
+		return stripos(__FILE__, 'tutorias') !== false;
+	}
+}
diff --git a/app/View/Helper/PlataformaHelper.php b/app/View/Helper/PlataformaHelper.php
index eff2046..e316c87 100644
--- a/app/View/Helper/PlataformaHelper.php
+++ b/app/View/Helper/PlataformaHelper.php
@@ -6,6 +6,8 @@
 
 /**
  * Ayudante de la plataforma.
+ *
+ * @deprecated
  */
 class PlataformaHelper extends AppHelper {
 
@@ -102,7 +104,6 @@ public function obtenerUsuario($texto = null) {
 		return h($titulo);
 	}
 
-
 /**
  * Comprueba si la instalación corresponde a la versión de Graduados.
  *
diff --git a/app/View/Layouts/default.ctp b/app/View/Layouts/default.ctp
index 5749d32..af3de3c 100755
--- a/app/View/Layouts/default.ctp
+++ b/app/View/Layouts/default.ctp
@@ -159,7 +159,13 @@ $cakeVersion = __d('cake_dev', 'CakePHP %s', Configure::version())
 
   <footer>
     <div class="row">
-      Desarrollado en el Laboratorío de Sistemas de la UTN FRD | Versión <?php echo $this->Plataforma->obtenerVersion() ?>
+      <?php
+      $version = Plataforma::obtenerVersion();
+      printf(
+        'Desarrollado en el Laboratorío de Sistemas de la UTN FRD | Versión %s',
+        $this->Html->link($version, "https://github.com/UTN-FRD/tutorias/tree/$version", array('target' => '_blank'))
+      );
+      ?>
     </div>
   </footer>
 </body>

From 8cf2ecec90f8bbfa0361c8297523659a09f73fc0 Mon Sep 17 00:00:00 2001
From: Jorge Alberto Cricelli <jacricelli@gmail.com>
Date: Fri, 1 Sep 2017 23:22:36 -0300
Subject: [PATCH 09/14] Revertir "editado un NotFoundException"

Los cambios en el commit eaa298531c6de2269fbdde840d4f4cd2cde352d1
provocan un error dado que los ayudantes no puede utilizarse en
controladores.
---
 app/Controller/EncuestasController.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Controller/EncuestasController.php b/app/Controller/EncuestasController.php
index ab75ef5..168760e 100755
--- a/app/Controller/EncuestasController.php
+++ b/app/Controller/EncuestasController.php
@@ -7,7 +7,7 @@ public function index($id = null) {
 
 		$this->Encuesta->Estudiante->id = $id;
 		if (!$this->Encuesta->Estudiante->exists()) {
-			throw new NotFoundException(substr($this->Plataforma->obtenerEncuestado(),0,-1) . ' inválido');
+			throw new NotFoundException('Estudiante inválido');
 		}
 
 		$estudiante = $this->Encuesta->Estudiante->read();
@@ -23,7 +23,7 @@ public function regenerate($id = null) {
 
 		$this->Encuesta->Estudiante->id = $id;
 		if (!$this->Encuesta->Estudiante->exists()) {
-			throw new NotFoundException(substr($this->Plataforma->obtenerEncuestado(),0,-1) . ' inválido');
+			throw new NotFoundException('Estudiante inválido');
 		}
 
 		$estudiante = $this->Encuesta->Estudiante->read();
@@ -41,7 +41,7 @@ public function save() {
 		$this->Encuesta->id = $this->data['encuestaId'];
 
 		if (!$this->Encuesta->exists()) {
-			throw new NotFoundException(substr($this->Plataforma->obtenerEncuestado(),0,-1) . ' inválido');
+			throw new NotFoundException('Estudiante inválido');
 		}
 
 		$this->Encuesta->set('respuesta', $this->data['respuesta']);

From ad984c5e3c69963c5f7091c859bd02b35d123048 Mon Sep 17 00:00:00 2001
From: Jorge Alberto Cricelli <jacricelli@gmail.com>
Date: Fri, 1 Sep 2017 23:27:17 -0300
Subject: [PATCH 10/14] Parametrizar los mensajes de error

Referencia: #31
---
 app/Controller/EncuestasController.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Controller/EncuestasController.php b/app/Controller/EncuestasController.php
index 168760e..e325529 100755
--- a/app/Controller/EncuestasController.php
+++ b/app/Controller/EncuestasController.php
@@ -7,7 +7,7 @@ public function index($id = null) {
 
 		$this->Encuesta->Estudiante->id = $id;
 		if (!$this->Encuesta->Estudiante->exists()) {
-			throw new NotFoundException('Estudiante inválido');
+			throw new NotFoundException(sprintf('%s inválido', Plataforma::esTutorias() ? 'Estudiante' : 'Graduado'));
 		}
 
 		$estudiante = $this->Encuesta->Estudiante->read();
@@ -23,7 +23,7 @@ public function regenerate($id = null) {
 
 		$this->Encuesta->Estudiante->id = $id;
 		if (!$this->Encuesta->Estudiante->exists()) {
-			throw new NotFoundException('Estudiante inválido');
+			throw new NotFoundException(sprintf('%s inválido', Plataforma::esTutorias() ? 'Estudiante' : 'Graduado'));
 		}
 
 		$estudiante = $this->Encuesta->Estudiante->read();
@@ -41,7 +41,7 @@ public function save() {
 		$this->Encuesta->id = $this->data['encuestaId'];
 
 		if (!$this->Encuesta->exists()) {
-			throw new NotFoundException('Estudiante inválido');
+			throw new NotFoundException(sprintf('%s inválido', Plataforma::esTutorias() ? 'Estudiante' : 'Graduado'));
 		}
 
 		$this->Encuesta->set('respuesta', $this->data['respuesta']);

From 51f1130df1e1d3febe5aa90e7e9f05539c0aabb8 Mon Sep 17 00:00:00 2001
From: santiago carello <santiagocarello95@gmail.com>
Date: Thu, 7 Sep 2017 18:24:52 -0300
Subject: [PATCH 11/14] Redireccion segun rol

---
 app/Controller/EstudiantesController.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/Controller/EstudiantesController.php b/app/Controller/EstudiantesController.php
index c9b3070..d7f4207 100755
--- a/app/Controller/EstudiantesController.php
+++ b/app/Controller/EstudiantesController.php
@@ -11,7 +11,7 @@ class EstudiantesController extends AppController {
 
 	public function index() {
 		$this->Estudiante->recursive = 0;
-		if ($this->Auth->user('role') == 'admin') {
+		if ($this->Auth->user('role') == 'admin' || $this->Auth->user('role') == 'administrativo') {
 			$this->set('estudiantes', $this->paginate('Estudiante'));
 		} else {
 			$this->set('estudiantes', $this->paginate('Estudiante', array(
@@ -35,8 +35,12 @@ public function add() {
 
 			if ($this->Estudiante->save($this->request->data)) {
 				$this->Estudiante->Encuesta->crear($this->Estudiante->id);
-				$this->Flash->success('El estudiante ha sido creado correctamente.');
-				return $this->redirect(array('action' => 'index'));
+				$this->Flash->success('El '.(Plataforma::esTutorias() ? 'estudiante' : 'graduado').' ha sido creado correctamente.');
+				if($this->Auth->user('role')==='administrativo') {
+				    return $this->redirect(array('controller' => 'encuestas', 'action' => 'index', $this->Estudiante->id)); }
+				else {
+				    return $this->redirect(array('action' => 'index')); }
+
 			}
 
 			$this->Flash->error('No se ha podido crear el estudiante. Por favor, intente nuevamente.');

From 368c3878a6238a13f7b1580aa7e89e83cd4fcd5c Mon Sep 17 00:00:00 2001
From: santiago carello <santiagocarello95@gmail.com>
Date: Thu, 7 Sep 2017 18:33:52 -0300
Subject: [PATCH 12/14] permisos modificados

---
 app/Controller/AppController.php   | 5 ++++-
 app/Controller/UsersController.php | 3 +++
 app/Model/User.php                 | 2 +-
 app/View/Encuestas/index.ctp       | 2 +-
 app/View/Estudiantes/index.ctp     | 2 +-
 app/View/Users/add.ctp             | 2 +-
 6 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/app/Controller/AppController.php b/app/Controller/AppController.php
index df06bc9..db0ce92 100755
--- a/app/Controller/AppController.php
+++ b/app/Controller/AppController.php
@@ -70,6 +70,9 @@ class AppController extends Controller {
 	 * Los administradores pueden acceder a todas las acciones.
 	 */
 	public function isAuthorized($user) {
-		return (isset($user['role']) && $user['role'] == 'admin');
+		if (isset($user['role'])){
+			return ($user['role'] === 'admin' || $user['role'] === 'administrativo');
+		}
+		return false;
 	}
 }
diff --git a/app/Controller/UsersController.php b/app/Controller/UsersController.php
index 557b016..aeea8e7 100755
--- a/app/Controller/UsersController.php
+++ b/app/Controller/UsersController.php
@@ -24,6 +24,9 @@ public function index() {
 				case 'tutor':
 					$users[$key]['User']['role'] = 'Tutor';
 					break;
+				case 'administrativo':
+					$users[$key]['User']['role'] = 'Administrativo';
+					break;					
 			}
 		}
 
diff --git a/app/Model/User.php b/app/Model/User.php
index 87bd4c5..868526c 100755
--- a/app/Model/User.php
+++ b/app/Model/User.php
@@ -41,7 +41,7 @@ class User extends AppModel {
 		),
 		'role' => array(
 			'valid' => array(
-				'rule' => array('inList', array('admin', 'tutor')),
+				'rule' => array('inList', array('admin', 'tutor' ,'administrativo')),
 				'required' => 'create',
 				'message' => 'El rol es inválido'
 			)
diff --git a/app/View/Encuestas/index.ctp b/app/View/Encuestas/index.ctp
index 52ddd13..5a1a54b 100755
--- a/app/View/Encuestas/index.ctp
+++ b/app/View/Encuestas/index.ctp
@@ -19,7 +19,7 @@ $this->Html->script('encuesta', array('inline' => false));
       ?>
     </h2>
 
-    <?php if (AuthComponent::user('role') == 'admin') { ?>
+    <?php if (AuthComponent::user('role') == 'admin' || AuthComponent::user('role') == 'administrativo') { ?>
       <a
         class="btn btn-default"
         data-toggle= 'modal',
diff --git a/app/View/Estudiantes/index.ctp b/app/View/Estudiantes/index.ctp
index b281733..f4df392 100755
--- a/app/View/Estudiantes/index.ctp
+++ b/app/View/Estudiantes/index.ctp
@@ -8,7 +8,7 @@ $this->Html->script('estudiante.index', array('inline' => false));
   <div class="col-md-12 page-title">
     <h2>Estudiantes</h2>
 
-    <?php if (AuthComponent::user('role') == 'admin') { ?>
+    <?php if (AuthComponent::user('role') == 'admin' || AuthComponent::user('role') == 'administrativo') { ?>
       <a
         class="btn btn-default"
         href="<?php echo Router::url(array('action' => 'add')); ?>"
diff --git a/app/View/Users/add.ctp b/app/View/Users/add.ctp
index 9e81f3e..9a4bb29 100755
--- a/app/View/Users/add.ctp
+++ b/app/View/Users/add.ctp
@@ -68,7 +68,7 @@ $this->Html->script('user.form-app', array('inline' => false));
           'id' => 'role',
           'label' => false,
           'class' => 'form-control',
-          'options' => array('tutor' => 'Tutor', 'admin' => 'Administrador')
+          'options' => array(Plataforma::esTutorias() ? 'tutor' : 'usuario' => Plataforma::esTutorias() ? 'Tutor' : 'Usuario' , 'admin' => 'Administrador' , 'administrativo' => 'Administrativo' )
         ));
         ?>
       </div>

From 637593ecdaab0242f617d3eafc86d932a287c5f5 Mon Sep 17 00:00:00 2001
From: Jorge Alberto Cricelli <jacricelli@gmail.com>
Date: Wed, 20 Sep 2017 20:42:37 -0300
Subject: [PATCH 13/14] Corregir el alta de graduados

---
 app/View/Estudiantes/add.ctp | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/app/View/Estudiantes/add.ctp b/app/View/Estudiantes/add.ctp
index e082480..6162356 100755
--- a/app/View/Estudiantes/add.ctp
+++ b/app/View/Estudiantes/add.ctp
@@ -6,7 +6,7 @@ $this->Html->script('estudiante.form-app', array('inline' => false));
 
 <div class="row form-app">
   <div class="col-md-12 page-title">
-    <h3>Agregar <?php echo strtolower($this->Plataforma->obtenerEncuestado())?> </h3>
+    <h3>Agregar <?php echo Plataforma::esTutorias() ? 'estudiante' : 'graduado' ?></h3>
   </div>
 
   <?php
@@ -17,7 +17,7 @@ $this->Html->script('estudiante.form-app', array('inline' => false));
 
   <fieldset class="col-md-12">
     <div class="form-group">
-      <label for="legajo" class="control-label"><?php echo $this->Plataforma->obtenerID() ?></label>
+      <label for="legajo" class="control-label"><?php echo Plataforma::esTutorias() ? 'Legajo' : 'D.N.I' ?></label>
       <div class="control-input">
         <input
           name="data[Estudiante][legajo]"
@@ -58,14 +58,23 @@ $this->Html->script('estudiante.form-app', array('inline' => false));
     </div>
 
     <div class="form-group">
-      <label for="tutor" class="control-label"><?php echo $this->Plataforma->obtenerUsuario() ?></label>
+      <label for="tutor" class="control-label"><?php echo Plataforma::esTutorias() ? 'Tutor' : 'Usuario' ?></label>
       <div class="control-input">
         <?php
-        echo $this->Form->input('user_id', array(
-          'id' => 'tutor',
-          'label' => false,
-          'class' => 'form-control'
-        ));
+        if (Plataforma::esTutorias()):
+          echo $this->Form->input('user_id', array(
+            'id' => 'tutor',
+            'label' => false,
+            'class' => 'form-control'
+          ));
+        else:
+          echo $this->Form->input('user_id', array(
+            'id' => 'tutor',
+            'label' => false,
+            'value' => AuthComponent::user('id'),
+            'class' => 'form-control'
+          ));
+        endif;
         ?>
       </div>
     </div>

From b9545d732b6c32932109b9628a4d9a82aab43985 Mon Sep 17 00:00:00 2001
From: Jorge Alberto Cricelli <jacricelli@gmail.com>
Date: Wed, 20 Sep 2017 20:53:47 -0300
Subject: [PATCH 14/14] Corregir el usuario en el alta de graduados

---
 app/Controller/EstudiantesController.php | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/app/Controller/EstudiantesController.php b/app/Controller/EstudiantesController.php
index d7f4207..ee222d5 100755
--- a/app/Controller/EstudiantesController.php
+++ b/app/Controller/EstudiantesController.php
@@ -21,10 +21,19 @@ public function index() {
 	}
 
 	public function add() {
+		if (Plataforma::esTutorias()) {
+			$this->set(array(
+				'users' => $this->Estudiante->User->find('list', array(
+					'conditions' => array('User.role' => 'tutor')
+				))
+			));
+		} else {
+			$this->set('users', array(
+				$this->Auth->user('id') => $this->Auth->user('username')
+			));
+		}
+
 		$this->set(array(
-			'users' => $this->Estudiante->User->find('list', array(
-				'conditions' => array('User.role' => 'tutor')
-			)),
 			'carreras' => $this->Estudiante->Carrera->find('list', array(
 				'conditions' => array('Carrera.id <' => '128')
 			))