Merge branch 'master' into develop

sails/src/assets/app/i18n/en-gb.json

@@ -227,6 +227,7 @@
     "October": "October",
     "office": "Office",
     "office_added": "Office added",
+    "office_center": "Office or center",
     "office_deleted": "Office deleted",
     "office_not_added": "Office not added",
     "office_not_deleted": "Office not deleted",

sails/src/assets/app/i18n/es-es.json

@@ -53,7 +53,7 @@
     "change_picture": "Cambiar fotografía",
     "child": "Niño",
     "click": "Clic",
-    "click_login": "Clic para iniciar sesión",
+    "click_login": "Volver a inicio de sesión",
     "click_to_edit": "clic para editar",
     "close": "Cerrar",
     "close_session": "Cerrar sesion",
@@ -404,6 +404,6 @@
     "woman": "Mujer",
     "year_totals": "Totales año",
     "yes": "Sí",
-    "your_email": "tu@email.aqui",
+    "your_email": "tu@email.aquí",
     "your_password": "tu contraseña"
 }

sails/src/assets/scripts/modules/login/views/login_setting_password.html

@@ -7,6 +7,7 @@
       <div class="col-md-4">
         <div id="login">
           <!-- Logo Pictogram -->
+	  <p>&nbsp;</p>
           <p class="text-center">
             <a href="/app/#/login"><img src="img/logo_pictogram.png" alt="Pictogram" title="Pictogram" /></a>
           </p>

sails/src/config/pictogram.js

@@ -5,7 +5,7 @@ var ASSETS_PATH = path.join(__dirname, '..', 'assets');
 var UPLOAD_PATH = path.join(__dirname, '..', '..', 'upload');
 
 module.exports.pictogram = {
-  version: "0.1", // actual version of the server, to be checked by the client
+  version: "1.0", // actual version of the server, to be checked by the client
   admin: {
     email: 'amontejo@ujaen.es',
     password: '$2a$06$flEEOc15SerMeYWARrN9w.KSpJuM.jDsaTgrtD0ESzbxKHPl0f/zq' //y00ttaa!!