Merge remote-tracking branch 'origin/develop' into fernando_branch

# Conflicts:
#	.gitignore
#	android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/tools/PCBcontext.java
#	android/Pictogram/tablet/src/main/java/com/yottacode/pictogram/tablet/net/NetServiceTablet.java
#	sails/src/assets/app/i18n/en-gb.json

android/Pictogram/app/build/generated/res/resValues/LocalFlavor/debug/values/generated.xml

+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- Automatically generated file. DO NOT MODIFY -->
+
+    <!-- Values from build type: debug -->
+    <bool name="force_db_create">false</bool>
+    <bool name="force_img_download">false</bool>
+
+    <integer name="netservice_timing">20</integer>
+
+    <bool name="ssl_connect">false</bool>
+    <!-- Values from product flavor: LocalFlavor -->
+    <string name="server" translatable="false">https://192.168.1.37:1337</string>
+    <!-- Values from default config. -->
+    <integer name="columns">10</integer>
+
+    <string name="core_vocabulary" translatable="false">core_vocabulary</string>
+    <string name="db_name" translatable="false">PCB.db</string>
+
+    <integer name="rows">5</integer>
+
+</resources>

android/Pictogram/app/build/generated/res/resValues/androidTest/LocalFlavor/debug/values/generated.xml

+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- Automatically generated file. DO NOT MODIFY -->
+
+    <!-- Values from build type: debug -->
+    <bool name="force_db_create">false</bool>
+    <bool name="force_img_download">false</bool>
+
+    <integer name="netservice_timing">20</integer>
+
+    <bool name="ssl_connect">false</bool>
+    <!-- Values from product flavor: LocalFlavor -->
+    <string name="server" translatable="false">https://192.168.1.37:1337</string>
+    <!-- Values from default config. -->
+    <integer name="columns">10</integer>
+
+    <string name="core_vocabulary" translatable="false">core_vocabulary</string>
+    <string name="db_name" translatable="false">PCB.db</string>
+
+    <integer name="rows">5</integer>
+
+</resources>

android/Pictogram/app/build/generated/source/buildConfig/LocalFlavor/debug/com/yottacode/pictogram/BuildConfig.java

+/**
+ * Automatically generated file. DO NOT MODIFY
+ */
+package com.yottacode.pictogram;
+
+public final class BuildConfig {
+  public static final boolean DEBUG = Boolean.parseBoolean("true");
+  public static final String APPLICATION_ID = "com.yottacode.pictogram";
+  public static final String BUILD_TYPE = "debug";
+  public static final String FLAVOR = "LocalFlavor";
+  public static final int VERSION_CODE = 1;
+  public static final String VERSION_NAME = "1.0";
+}

android/Pictogram/app/build/generated/source/buildConfig/androidTest/LocalFlavor/debug/com/yottacode/pictogram/test/BuildConfig.java

+/**
+ * Automatically generated file. DO NOT MODIFY
+ */
+package com.yottacode.pictogram.test;
+
+public final class BuildConfig {
+  public static final boolean DEBUG = Boolean.parseBoolean("true");
+  public static final String APPLICATION_ID = "com.yottacode.pictogram.test";
+  public static final String BUILD_TYPE = "debug";
+  public static final String FLAVOR = "LocalFlavor";
+  public static final int VERSION_CODE = 1;
+  public static final String VERSION_NAME = "1.0";
+}

android/Pictogram/app/build/generated/source/r/androidTest/LocalFlavor/debug/com/yottacode/pictogram/test/R.java

+/* AUTO-GENERATED FILE.  DO NOT MODIFY.
+ *
+ * This class was automatically generated by the
+ * aapt tool from the resource data it found.  It
+ * should not be modified by hand.
+ */
+
+package com.yottacode.pictogram.test;
+
+public final class R {
+    public static final class attr {
+    }
+    public static final class bool {
+        public static final int force_db_create=0x7f020000;
+        public static final int force_img_download=0x7f020001;
+        public static final int ssl_connect=0x7f020002;
+    }
+    public static final class integer {
+        public static final int columns=0x7f030000;
+        public static final int netservice_timing=0x7f030001;
+        public static final int rows=0x7f030002;
+    }
+    public static final class string {
+        public static final int core_vocabulary=0x7f040000;
+        public static final int db_name=0x7f040001;
+        public static final int server=0x7f040002;
+    }
+}