Merge with feature/2FA branch

.editorconfig

@@ -0,0 +1,21 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+insert_final_newline = true
+trim_trailing_whitespace = true
+end_of_line = lf
+charset = utf-8
+max_line_length = 88
+
+[*.{yml,yaml,json,js,css,html}]
+indent_size = 2
+
+[*.{md,rst}]
+trim_trailing_whitespace = false
+
+# tabs 2 spaces for makefiles
+[Makefile]
+indent_style = tab
+indent_size = 2

composer.json

@@ -50,7 +50,8 @@
         "laminas/laminas-permissions-rbac": "^3.0",
         "laminas/laminas-log": "^2.11",
         "laminas/laminas-i18n": "^2.9",
-        "laminas/laminas-dependency-plugin": "^2.0"
+        "laminas/laminas-dependency-plugin": "^2.0",
+        "robthree/twofactorauth": "^1.8"
     },
     "require-dev": {
         "roave/security-advisories": "dev-master"

config/autoload/local.php.dist

@@ -51,6 +51,8 @@ return array(
     */
     'activeLanguages' => array('fr','en','de','nl'),
 
+    'instanceName' => 'Development', // for example a short URL or client name from ansible
+
     'monarc' => array(
         'ttl' => 20, // timeout
         'salt' => '', // salt privé pour chiffrement pwd

package.json

@@ -15,6 +15,6 @@
   },
   "devDependencies": {
     "grunt": "~1.5.3",
-    "grunt-cli": "~1.4.2"
+    "grunt-cli": "~1.4.3"
   }
 }