diff --git a/docs/3.x.x/en/README.md b/docs/3.x.x/en/README.md
index 8747a3ae9f..eaac1d37a2 100644
--- a/docs/3.x.x/en/README.md
+++ b/docs/3.x.x/en/README.md
@@ -15,10 +15,10 @@ The most advanced open-source Content Management Framework to build powerful API
 
 {% endcenter %}
 
-## v3@alpha.12 is available!
+## v3@alpha.13 is available!
 We've been working on a major update for Strapi during the past months, rewriting the core framework and the dashboard.
 
-This documentation is only related to Strapi v3@alpha.12 ([v1 documentation is still available](http://strapi.io/documentation/1.x.x)).
+This documentation is only related to Strapi v3@alpha.13 ([v1 documentation is still available](http://strapi.io/documentation/1.x.x)).
 
 **[Get Started](getting-started/installation.md)**<br />
 Learn how to install Strapi and start developing your API.
diff --git a/docs/3.x.x/en/configurations/configurations.md b/docs/3.x.x/en/configurations/configurations.md
index 01f3bcb751..56a2ba4d51 100644
--- a/docs/3.x.x/en/configurations/configurations.md
+++ b/docs/3.x.x/en/configurations/configurations.md
@@ -213,9 +213,9 @@ Most of the application's configurations are defined by environment. It means th
         "client": "postgres",
         "host": "localhost",
         "port": 5432,
-        "username": "aureliengeorget",
-        "password": "${process.env.USERNAME}",
-        "database": "${process.env.PWD}",
+        "username": "${process.env.USERNAME}",
+        "password": "${process.env.PWD}",
+        "database": "strapi",
         "schema": "public"
       },
       "options": {
@@ -228,7 +228,7 @@ Most of the application's configurations are defined by environment. It means th
         "client": "mysql",
         "host": "localhost",
         "port": 5432,
-        "username": "aureliengeorget",
+        "username": "strapi",
         "password": "root",
         "database": ""
       },
diff --git a/package.json b/package.json
index d155c12821..e91587fcd6 100755
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "private": true,
-  "version": "3.0.0-alpha.13",
+  "version": "3.0.0-alpha.13.0.1",
   "dependencies": {},
   "devDependencies": {
     "assert": "~1.3.0",
diff --git a/packages/strapi-admin/admin/src/containers/InstallPluginPage/saga.js b/packages/strapi-admin/admin/src/containers/InstallPluginPage/saga.js
index a338200eb6..ee8c18c416 100644
--- a/packages/strapi-admin/admin/src/containers/InstallPluginPage/saga.js
+++ b/packages/strapi-admin/admin/src/containers/InstallPluginPage/saga.js
@@ -64,8 +64,14 @@ export function* pluginsGet() {
       },
     };
 
-    // Retrieve plugins list.
-    const availablePlugins = yield call(request, 'https://marketplace.strapi.io/plugins', opts);
+    let availablePlugins;
+
+    try {
+      // Retrieve plugins list.
+      availablePlugins = yield call(request, 'https://marketplace.strapi.io/plugins', opts);
+    } catch (e) {
+      availablePlugins = [];
+    }
 
     yield put(getPluginsSucceeded(availablePlugins));
   } catch(err) {
diff --git a/packages/strapi-admin/admin/src/containers/ListPluginsPage/saga.js b/packages/strapi-admin/admin/src/containers/ListPluginsPage/saga.js
index efb3f3dff0..a6257fbb1c 100644
--- a/packages/strapi-admin/admin/src/containers/ListPluginsPage/saga.js
+++ b/packages/strapi-admin/admin/src/containers/ListPluginsPage/saga.js
@@ -52,8 +52,14 @@ export function* pluginsGet() {
       },
     };
 
-    // Fetch plugins informations.
-    const availablePlugins = yield call(request, 'https://marketplace.strapi.io/plugins', opts);
+    let availablePlugins;
+
+    try {
+      // Fetch plugins informations.
+      availablePlugins = yield call(request, 'https://marketplace.strapi.io/plugins', opts);
+    } catch (e) {
+      availablePlugins = [];
+    }
 
     // Add logo URL to object.
     Object.keys(response[0].plugins).map(name => {
diff --git a/packages/strapi-admin/admin/src/translations/it.json b/packages/strapi-admin/admin/src/translations/it.json
index 0b5d31579e..b2fbabb75f 100644
--- a/packages/strapi-admin/admin/src/translations/it.json
+++ b/packages/strapi-admin/admin/src/translations/it.json
@@ -89,6 +89,7 @@
   "components.popUpWarning.title": "Per favore conferma",
   "components.popUpWarning.message": "Sei sicuro di volerlo cancellare?",
   "components.Input.error.validation.email": "Non è un'email",
+  "components.Input.error.validation.json" : "Formato JSON non corrispondente",
   "components.Input.error.validation.required": "Valore obbligatorio.",
   "components.Input.error.validation.regex": "Questo valore non coincide con il regex.",
   "components.Input.error.validation.max": "Valore troppo alto.",
@@ -119,18 +120,21 @@
   "HomePage.notification.newsLetter.success": "Iscritto con successo alla newsletter",
   "notification.error": "Si è verificato un errore",
   "notification.error.layout": "Non è stato possibile recuperare il layout",
+  "request.error.model.unknown" : "Questo modello non esiste",
   "Users & Permissions": "Utenti & Permessi",
   "Content Manager": "Gestione Contenuti",
   "Content Type Builder": "Generatore di Tipo Contenuti",
   "Settings Manager": "Gestione Impostazioni",
   "Email": "Email",
+  "Files Upload" : "Caricamento Files",
   "Password": "Password",
   "Username": "Username",
   "Provider": "Provider",
   "ResetPasswordToken": "Reimposta Token Password",
   "Role": "Ruolo",
+  "Roles & Permissions" : "Ruoli e Permessi",
   "New entry": "Nuovo elemento",
   "request.error.model.unknow": "Questo modello non esiste",
   "Users": "Utenti",
   "Analytics": "Analytics"
-}
\ No newline at end of file
+}
diff --git a/packages/strapi-admin/admin/src/translations/tr.json b/packages/strapi-admin/admin/src/translations/tr.json
index 6d54e48144..0bc2bd7af5 100755
--- a/packages/strapi-admin/admin/src/translations/tr.json
+++ b/packages/strapi-admin/admin/src/translations/tr.json
@@ -122,10 +122,11 @@
   "components.Input.error.attribute.sameKeyAndName": "Eşit olamaz",
   "components.Input.error.validation.minSupMax": "Üstü olamaz",
   "components.Input.error.custom-error": "{errorMessage} ",
+  "components.Input.error.validation.json": "Bu JSON biçimi ile eşleşmiyor",
 
   "components.ListRow.empty": "Gösterilecek veri bulunmamaktadır.",
 
-  "components.Wysiwyg.collapse": "Collapse",
+  "components.Wysiwyg.collapse": "Daralt",
   "components.Wysiwyg.selectOptions.title": "Başlık ekle",
   "components.Wysiwyg.selectOptions.H1": "H1 başlık",
   "components.Wysiwyg.selectOptions.H2": "H2 başlık",
@@ -143,11 +144,13 @@
   "HomePage.notification.newsLetter.success": "Bültene başarıyla abone olundu",
 
   "notification.error": "Bir hata oluştu",
-  "notification.error.layout": "Couldn't retrieve the layout",
+  "notification.error.layout": "Düzen alınamadı",
 
   "Users & Permissions": "Kullanıcılar & İzinler",
   "Content Manager": "İçerik Yönetimi",
   "Content Type Builder": "İçerik Türü Oluşturucusu",
+  "Files Upload": "Dosya yükleme",
+  "Roles & Permissions": "Roller & İzinler",
   "Settings Manager": "Yönetici Ayarları",
   "Email": "E-posta",
   "Password": "Şifre",
diff --git a/packages/strapi-admin/package.json b/packages/strapi-admin/package.json
index 4c90d5d1ef..a918c9edf7 100755
--- a/packages/strapi-admin/package.json
+++ b/packages/strapi-admin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-admin",
-  "version": "3.0.0-alpha.13",
+  "version": "3.0.0-alpha.13.0.1",
   "description": "Strapi Admin",
   "repository": {
     "type": "git",
@@ -31,8 +31,8 @@
   },
   "devDependencies": {
     "sanitize.css": "^4.1.0",
-    "strapi-helper-plugin": "3.0.0-alpha.13",
-    "strapi-utils": "3.0.0-alpha.13"
+    "strapi-helper-plugin": "3.0.0-alpha.13.0.1",
+    "strapi-utils": "3.0.0-alpha.13.0.1"
   },
   "author": {
     "name": "Strapi",
diff --git a/packages/strapi-email-amazon-ses/.editorconfig b/packages/strapi-email-amazon-ses/.editorconfig
new file mode 100644
index 0000000000..473e45184b
--- /dev/null
+++ b/packages/strapi-email-amazon-ses/.editorconfig
@@ -0,0 +1,16 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[{package.json,*.yml}]
+indent_style = space
+indent_size = 2
+
+[*.md]
+trim_trailing_whitespace = false
diff --git a/packages/strapi-email-amazon-ses/.gitignore b/packages/strapi-email-amazon-ses/.gitignore
new file mode 100644
index 0000000000..ab74240ce1
--- /dev/null
+++ b/packages/strapi-email-amazon-ses/.gitignore
@@ -0,0 +1,96 @@
+############################
+# OS X
+############################
+
+.DS_Store
+.AppleDouble
+.LSOverride
+Icon
+.Spotlight-V100
+.Trashes
+._*
+
+
+############################
+# Linux
+############################
+
+*~
+
+
+############################
+# Windows
+############################
+
+Thumbs.db
+ehthumbs.db
+Desktop.ini
+$RECYCLE.BIN/
+*.cab
+*.msi
+*.msm
+*.msp
+
+
+############################
+# Packages
+############################
+
+*.7z
+*.csv
+*.dat
+*.dmg
+*.gz
+*.iso
+*.jar
+*.rar
+*.tar
+*.zip
+*.com
+*.class
+*.dll
+*.exe
+*.o
+*.seed
+*.so
+*.swo
+*.swp
+*.swn
+*.swm
+*.out
+*.pid
+
+
+############################
+# Logs and databases
+############################
+
+.tmp
+*.log
+*.sql
+*.sqlite
+
+
+############################
+# Misc.
+############################
+
+*#
+.idea
+nbproject
+
+
+############################
+# Node.js
+############################
+
+lib-cov
+lcov.info
+pids
+logs
+results
+build
+node_modules
+.node_history
+package-lock.json
+yarn.lock
diff --git a/packages/strapi-email-amazon-ses/.npmignore b/packages/strapi-email-amazon-ses/.npmignore
new file mode 100644
index 0000000000..af4e0054dd
--- /dev/null
+++ b/packages/strapi-email-amazon-ses/.npmignore
@@ -0,0 +1,104 @@
+############################
+# OS X
+############################
+
+.DS_Store
+.AppleDouble
+.LSOverride
+Icon
+.Spotlight-V100
+.Trashes
+._*
+
+
+############################
+# Linux
+############################
+
+*~
+
+
+############################
+# Windows
+############################
+
+Thumbs.db
+ehthumbs.db
+Desktop.ini
+$RECYCLE.BIN/
+*.cab
+*.msi
+*.msm
+*.msp
+
+
+############################
+# Packages
+############################
+
+*.7z
+*.csv
+*.dat
+*.dmg
+*.gz
+*.iso
+*.jar
+*.rar
+*.tar
+*.zip
+*.com
+*.class
+*.dll
+*.exe
+*.o
+*.seed
+*.so
+*.swo
+*.swp
+*.swn
+*.swm
+*.out
+*.pid
+
+
+############################
+# Logs and databases
+############################
+
+.tmp
+*.log
+*.sql
+*.sqlite
+
+
+############################
+# Misc.
+############################
+
+*#
+ssl
+.editorconfig
+.gitattributes
+.idea
+nbproject
+
+
+############################
+# Node.js
+############################
+
+lib-cov
+lcov.info
+pids
+logs
+results
+build
+node_modules
+.node_history
+
+
+############################
+# Tests
+############################
+
+test
diff --git a/packages/strapi-email-amazon-ses/LICENSE.md b/packages/strapi-email-amazon-ses/LICENSE.md
new file mode 100644
index 0000000000..6865b7e33f
--- /dev/null
+++ b/packages/strapi-email-amazon-ses/LICENSE.md
@@ -0,0 +1,7 @@
+Copyright (c) 2018 Nikolay Tsenkov (nikolay@tsenkov.net).
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/packages/strapi-email-amazon-ses/README.md b/packages/strapi-email-amazon-ses/README.md
new file mode 100644
index 0000000000..b6c41e6f2e
--- /dev/null
+++ b/packages/strapi-email-amazon-ses/README.md
@@ -0,0 +1,11 @@
+# strapi-email-amazon-ses
+
+## Resources
+
+- [MIT License](LICENSE.md)
+
+## Links
+
+- [Strapi website](http://strapi.io/)
+- [Strapi community on Slack](http://slack.strapi.io)
+- [Strapi news on Twitter](https://twitter.com/strapijs)
diff --git a/packages/strapi-email-amazon-ses/lib/index.js b/packages/strapi-email-amazon-ses/lib/index.js
new file mode 100644
index 0000000000..5b0532820a
--- /dev/null
+++ b/packages/strapi-email-amazon-ses/lib/index.js
@@ -0,0 +1,73 @@
+'use strict';
+
+/**
+ * Module dependencies
+ */
+
+/* eslint-disable import/no-unresolved */
+/* eslint-disable prefer-template */
+// Public node modules.
+const _ = require('lodash');
+const nodeSES = require('node-ses');
+
+/* eslint-disable no-unused-vars */
+module.exports = {
+  provider: 'amazon-ses',
+  name: 'Amazon SES',
+  auth: {
+    amazon_ses_default_from: {
+      label: 'Default From',
+      type: 'text'
+    },
+    amazon_ses_default_replyto: {
+      label: 'Default Reply-To',
+      type: 'text'
+    },
+    amazon_ses_api_key: {
+      label: 'Amazon Access key ID',
+      type: 'text'
+    },
+    amazon_ses_secret: {
+      label: 'Amazon Secret access key',
+      type: 'text'
+    }
+  },
+
+  init: (config) => {
+
+    var client = nodeSES.createClient({
+      key: config.amazon_ses_api_key,
+      secret: config.amazon_ses_secret
+    });
+
+    return {
+      send: (options, cb) => {
+        return new Promise((resolve, reject) => {
+          // Default values.
+          options = _.isObject(options) ? options : {};
+          options.from = options.from || config.amazon_ses_default_from;
+          options.replyTo = options.replyTo || config.amazon_ses_default_replyto;
+          options.text = options.text || options.html;
+          options.html = options.html || options.text;
+
+          let msg = {
+            from: options.from,
+            to: options.to,
+            replyTo: options.replyTo,
+            subject: options.subject,
+            altText: options.text,
+            message: options.html
+          };
+
+          client.sendEmail(msg, function (err) {
+            if (err) {
+              reject([{ messages: [{ id: 'Auth.form.error.email.invalid' }] }]);
+            } else {
+              resolve();
+            }
+          });
+        });
+      }
+    };
+  }
+};
diff --git a/packages/strapi-email-amazon-ses/package.json b/packages/strapi-email-amazon-ses/package.json
new file mode 100644
index 0000000000..74c181aa1c
--- /dev/null
+++ b/packages/strapi-email-amazon-ses/package.json
@@ -0,0 +1,45 @@
+{
+  "name": "strapi-email-amazon-ses",
+  "version": "3.0.0-alpha.13",
+  "description": "Amazon SES provider for strapi email",
+  "homepage": "http://strapi.io",
+  "keywords": [
+    "email",
+    "strapi",
+    "amazon",
+    "ses"
+  ],
+  "directories": {
+    "lib": "./lib"
+  },
+  "main": "./lib",
+  "dependencies": {
+    "node-ses": "^2.1.0"
+  },
+  "strapi": {
+    "isProvider": true
+  },
+  "author": {
+    "email": "nikolay@tsenkov.net",
+    "name": "Nikolay tsenkov"
+  },
+  "maintainers": [
+    {
+      "name": "Strapi team",
+      "email": "hi@strapi.io",
+      "url": "http://strapi.io"
+    }
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/strapi/strapi.git"
+  },
+  "bugs": {
+    "url": "https://github.com/strapi/strapi/issues"
+  },
+  "engines": {
+    "node": ">= 9.0.0",
+    "npm": ">= 5.3.0"
+  },
+  "license": "MIT"
+}
diff --git a/packages/strapi-email-mailgun/package.json b/packages/strapi-email-mailgun/package.json
index f2a359c0fd..965da84429 100644
--- a/packages/strapi-email-mailgun/package.json
+++ b/packages/strapi-email-mailgun/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-email-mailgun",
-  "version": "3.0.0-alpha.13",
+  "version": "3.0.0-alpha.13.0.1",
   "description": "Mailgun provider for strapi email plugin",
   "homepage": "http://strapi.io",
   "keywords": [
@@ -42,4 +42,4 @@
     "npm": ">= 5.3.0"
   },
   "license": "MIT"
-}
\ No newline at end of file
+}
diff --git a/packages/strapi-email-sendgrid/package.json b/packages/strapi-email-sendgrid/package.json
index 6ba279c9fc..b48fca45ca 100644
--- a/packages/strapi-email-sendgrid/package.json
+++ b/packages/strapi-email-sendgrid/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-email-sendgrid",
-  "version": "3.0.0-alpha.13",
+  "version": "3.0.0-alpha.13.0.1",
   "description": "Sendgrid provider for strapi email",
   "homepage": "http://strapi.io",
   "keywords": [
@@ -42,4 +42,4 @@
     "npm": ">= 5.3.0"
   },
   "license": "MIT"
-}
\ No newline at end of file
+}
diff --git a/packages/strapi-email-sendmail/package.json b/packages/strapi-email-sendmail/package.json
index 387be2e3f8..10ae86a7bf 100644
--- a/packages/strapi-email-sendmail/package.json
+++ b/packages/strapi-email-sendmail/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-email-sendmail",
-  "version": "3.0.0-alpha.13",
+  "version": "3.0.0-alpha.13.0.1",
   "description": "Sendmail provider for strapi email",
   "homepage": "http://strapi.io",
   "keywords": [
@@ -41,4 +41,4 @@
     "npm": ">= 5.3.0"
   },
   "license": "MIT"
-}
\ No newline at end of file
+}
diff --git a/packages/strapi-generate-admin/package.json b/packages/strapi-generate-admin/package.json
index 63354c05de..310ebd1133 100755
--- a/packages/strapi-generate-admin/package.json
+++ b/packages/strapi-generate-admin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-generate-admin",
-  "version": "3.0.0-alpha.13",
+  "version": "3.0.0-alpha.13.0.1",
   "description": "Generate the default admin panel for a Strapi application.",
   "homepage": "http://strapi.io",
   "keywords": [
@@ -15,8 +15,8 @@
   "dependencies": {
     "fs-extra": "^4.0.1",
     "lodash": "^4.17.4",
-    "strapi-admin": "3.0.0-alpha.13",
-    "strapi-utils": "3.0.0-alpha.13"
+    "strapi-admin": "3.0.0-alpha.13.0.1",
+    "strapi-utils": "3.0.0-alpha.13.0.1"
   },
   "author": {
     "email": "hi@strapi.io",
@@ -42,4 +42,4 @@
     "npm": ">= 5.3.0"
   },
   "license": "MIT"
-}
\ No newline at end of file
+}
diff --git a/packages/strapi-generate-api/package.json b/packages/strapi-generate-api/package.json
index 0165d8de30..bfb0c13df0 100755
--- a/packages/strapi-generate-api/package.json
+++ b/packages/strapi-generate-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-generate-api",
-  "version": "3.0.0-alpha.13",
+  "version": "3.0.0-alpha.13.0.1",
   "description": "Generate an API for a Strapi application.",
   "homepage": "http://strapi.io",
   "keywords": [
diff --git a/packages/strapi-generate-controller/package.json b/packages/strapi-generate-controller/package.json
index 69c6bd8b0b..5cd499799d 100755
--- a/packages/strapi-generate-controller/package.json
+++ b/packages/strapi-generate-controller/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-generate-controller",
-  "version": "3.0.0-alpha.13",
+  "version": "3.0.0-alpha.13.0.1",
   "description": "Generate a controller for a Strapi API.",
   "homepage": "http://strapi.io",
   "keywords": [
diff --git a/packages/strapi-generate-model/package.json b/packages/strapi-generate-model/package.json
index bda41f5638..fbad572226 100755
--- a/packages/strapi-generate-model/package.json
+++ b/packages/strapi-generate-model/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-generate-model",
-  "version": "3.0.0-alpha.13",
+  "version": "3.0.0-alpha.13.0.1",
   "description": "Generate a model for a Strapi API.",
   "homepage": "http://strapi.io",
   "keywords": [
diff --git a/packages/strapi-generate-new/package.json b/packages/strapi-generate-new/package.json
index 0b62c02b5a..e59055ecd3 100755
--- a/packages/strapi-generate-new/package.json
+++ b/packages/strapi-generate-new/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-generate-new",
-  "version": "3.0.0-alpha.13",
+  "version": "3.0.0-alpha.13.0.1",
   "description": "Generate a new Strapi application.",
   "homepage": "http://strapi.io",
   "keywords": [
@@ -19,7 +19,7 @@
     "listr": "^0.14.1",
     "lodash": "^4.17.4",
     "ora": "^2.1.0",
-    "strapi-utils": "3.0.0-alpha.13",
+    "strapi-utils": "3.0.0-alpha.13.0.1",
     "uuid": "^3.1.0"
   },
   "scripts": {
diff --git a/packages/strapi-generate-plugin/package.json b/packages/strapi-generate-plugin/package.json
index c160e95aaa..79188e5162 100755
--- a/packages/strapi-generate-plugin/package.json
+++ b/packages/strapi-generate-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-generate-plugin",
-  "version": "3.0.0-alpha.13",
+  "version": "3.0.0-alpha.13.0.1",
   "description": "Generate an plugin for a Strapi application.",
   "homepage": "http://strapi.io",
   "keywords": [
diff --git a/packages/strapi-generate-policy/package.json b/packages/strapi-generate-policy/package.json
index 1f9c05b192..e37c9fc5aa 100755
--- a/packages/strapi-generate-policy/package.json
+++ b/packages/strapi-generate-policy/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-generate-policy",
-  "version": "3.0.0-alpha.13",
+  "version": "3.0.0-alpha.13.0.1",
   "description": "Generate a policy for a Strapi API.",
   "homepage": "http://strapi.io",
   "keywords": [
diff --git a/packages/strapi-generate-service/package.json b/packages/strapi-generate-service/package.json
index c18b80e770..ec20e0f2e4 100755
--- a/packages/strapi-generate-service/package.json
+++ b/packages/strapi-generate-service/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-generate-service",
-  "version": "3.0.0-alpha.13",
+  "version": "3.0.0-alpha.13.0.1",
   "description": "Generate a service for a Strapi API.",
   "homepage": "http://strapi.io",
   "keywords": [
diff --git a/packages/strapi-generate/package.json b/packages/strapi-generate/package.json
index e98e3eeae6..6b7b2256d8 100755
--- a/packages/strapi-generate/package.json
+++ b/packages/strapi-generate/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-generate",
-  "version": "3.0.0-alpha.13",
+  "version": "3.0.0-alpha.13.0.1",
   "description": "Master of ceremonies for the Strapi generators.",
   "homepage": "http://strapi.io",
   "keywords": [
@@ -17,7 +17,7 @@
     "fs-extra": "^4.0.0",
     "lodash": "^4.17.4",
     "reportback": "^2.0.1",
-    "strapi-utils": "3.0.0-alpha.13"
+    "strapi-utils": "3.0.0-alpha.13.0.1"
   },
   "author": {
     "name": "Strapi team",
@@ -43,4 +43,4 @@
     "npm": ">= 5.3.0"
   },
   "license": "MIT"
-}
\ No newline at end of file
+}
diff --git a/packages/strapi-helper-plugin/package.json b/packages/strapi-helper-plugin/package.json
index 7560dc3736..3ecea9c62b 100755
--- a/packages/strapi-helper-plugin/package.json
+++ b/packages/strapi-helper-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-helper-plugin",
-  "version": "3.0.0-alpha.13",
+  "version": "3.0.0-alpha.13.0.1",
   "description": "Helper for Strapi plugins development",
   "engines": {
     "node": ">= 9.0.0",
@@ -115,4 +115,4 @@
     "webpack-hot-middleware": "^2.18.2",
     "whatwg-fetch": "^2.0.3"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/strapi-hook-bookshelf/lib/index.js b/packages/strapi-hook-bookshelf/lib/index.js
index 39214f7cc8..f91837dcc3 100755
--- a/packages/strapi-hook-bookshelf/lib/index.js
+++ b/packages/strapi-hook-bookshelf/lib/index.js
@@ -402,7 +402,7 @@ module.exports = function(strapi) {
                       } else {
                         switch (attribute.type) {
                           case 'text':
-                            type = 'text';
+                            type = definition.client === 'pg' ? type = 'text' : 'longtext';
                             break;
                           case 'json':
                             type = definition.client === 'pg' ? 'jsonb' : 'longtext';
diff --git a/packages/strapi-hook-bookshelf/lib/relations.js b/packages/strapi-hook-bookshelf/lib/relations.js
index 4b3083bad9..09a6a26291 100644
--- a/packages/strapi-hook-bookshelf/lib/relations.js
+++ b/packages/strapi-hook-bookshelf/lib/relations.js
@@ -381,7 +381,7 @@ module.exports = {
         [`${params.alias}_id`]: params.refId,
         [`${params.alias}_type`]: params.ref,
         field: params.field
-      }, _.isEmpty))
+      }, _.isUndefined))
       .destroy();
   }
 };
diff --git a/packages/strapi-hook-bookshelf/package.json b/packages/strapi-hook-bookshelf/package.json
index 74d13abfb5..f7a76f0dbd 100755
--- a/packages/strapi-hook-bookshelf/package.json
+++ b/packages/strapi-hook-bookshelf/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-hook-bookshelf",
-  "version": "3.0.0-alpha.13",
+  "version": "3.0.0-alpha.13.0.1",
   "description": "Bookshelf hook for the Strapi framework",
   "homepage": "http://strapi.io",
   "keywords": [
@@ -20,8 +20,8 @@
     "inquirer": "^5.2.0",
     "lodash": "^4.17.4",
     "pluralize": "^6.0.0",
-    "strapi-hook-knex": "3.0.0-alpha.13",
-    "strapi-utils": "3.0.0-alpha.13"
+    "strapi-hook-knex": "3.0.0-alpha.13.0.1",
+    "strapi-utils": "3.0.0-alpha.13.0.1"
   },
   "strapi": {
     "dependencies": [
diff --git a/packages/strapi-hook-ejs/package.json b/packages/strapi-hook-ejs/package.json
index 6c0e110886..df594d486b 100755
--- a/packages/strapi-hook-ejs/package.json
+++ b/packages/strapi-hook-ejs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-hook-ejs",
-  "version": "3.0.0-alpha.13",
+  "version": "3.0.0-alpha.13.0.1",
   "description": "EJS hook for the Strapi framework",
   "homepage": "http://strapi.io",
   "keywords": [
diff --git a/packages/strapi-hook-knex/package.json b/packages/strapi-hook-knex/package.json
index 29f2fda139..fabc2d9d20 100755
--- a/packages/strapi-hook-knex/package.json
+++ b/packages/strapi-hook-knex/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-hook-knex",
-  "version": "3.0.0-alpha.13",
+  "version": "3.0.0-alpha.13.0.1",
   "description": "Knex hook for the Strapi framework",
   "homepage": "http://strapi.io",
   "keywords": [
@@ -43,4 +43,4 @@
     "npm": ">= 5.0.0"
   },
   "license": "MIT"
-}
\ No newline at end of file
+}
diff --git a/packages/strapi-hook-mongoose/package.json b/packages/strapi-hook-mongoose/package.json
index 0dd6f2c8e0..d823b8028d 100755
--- a/packages/strapi-hook-mongoose/package.json
+++ b/packages/strapi-hook-mongoose/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-hook-mongoose",
-  "version": "3.0.0-alpha.13",
+  "version": "3.0.0-alpha.13.0.1",
   "description": "Mongoose hook for the Strapi framework",
   "homepage": "http://strapi.io",
   "keywords": [
@@ -19,7 +19,7 @@
     "mongoose": "^5.0.16",
     "mongoose-float": "^1.0.2",
     "pluralize": "^6.0.0",
-    "strapi-utils": "3.0.0-alpha.13"
+    "strapi-utils": "3.0.0-alpha.13.0.1"
   },
   "author": {
     "email": "hi@strapi.io",
@@ -45,4 +45,4 @@
     "npm": ">= 5.3.0"
   },
   "license": "MIT"
-}
\ No newline at end of file
+}
diff --git a/packages/strapi-hook-redis/package.json b/packages/strapi-hook-redis/package.json
index 0ad8ca9530..dece5c74e3 100755
--- a/packages/strapi-hook-redis/package.json
+++ b/packages/strapi-hook-redis/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-hook-redis",
-  "version": "3.0.0-alpha.13",
+  "version": "3.0.0-alpha.13.0.1",
   "description": "Redis hook for the Strapi framework",
   "homepage": "http://strapi.io",
   "keywords": [
@@ -18,7 +18,7 @@
     "ioredis": "^3.1.2",
     "lodash": "^4.17.4",
     "stack-trace": "0.0.10",
-    "strapi-utils": "3.0.0-alpha.13"
+    "strapi-utils": "3.0.0-alpha.13.0.1"
   },
   "author": {
     "email": "hi@strapi.io",
@@ -44,4 +44,4 @@
     "npm": ">= 5.3.0"
   },
   "license": "MIT"
-}
\ No newline at end of file
+}
diff --git a/packages/strapi-lint/package.json b/packages/strapi-lint/package.json
index 963c82b6e0..1500b98b5e 100644
--- a/packages/strapi-lint/package.json
+++ b/packages/strapi-lint/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-lint",
-  "version": "3.0.0-alpha.13",
+  "version": "3.0.0-alpha.13.0.1",
   "description": "Strapi eslint and prettier configurations",
   "directories": {
     "lib": "lib"
@@ -41,4 +41,4 @@
     "babel-eslint": "^8.2.3",
     "prettier": "^1.12.1"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/strapi-middleware-views/package.json b/packages/strapi-middleware-views/package.json
index 763c3dd124..f1fdf961bf 100755
--- a/packages/strapi-middleware-views/package.json
+++ b/packages/strapi-middleware-views/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-middleware-views",
-  "version": "3.0.0-alpha.13",
+  "version": "3.0.0-alpha.13.0.1",
   "description": "Views middleware to enable server-side rendering for the Strapi framework",
   "homepage": "http://strapi.io",
   "keywords": [
@@ -43,4 +43,4 @@
     "npm": ">= 5.3.0"
   },
   "license": "MIT"
-}
\ No newline at end of file
+}
diff --git a/packages/strapi-plugin-content-manager/admin/src/translations/it.json b/packages/strapi-plugin-content-manager/admin/src/translations/it.json
index dff27611c5..eae07212b5 100644
--- a/packages/strapi-plugin-content-manager/admin/src/translations/it.json
+++ b/packages/strapi-plugin-content-manager/admin/src/translations/it.json
@@ -14,16 +14,27 @@
 	"containers.List.pluginHeaderDescription.singular": "{label} voce trovati",
 	"components.LimitSelect.itemsPerPage": "Elementi per pagina",
   "containers.List.errorFetchRecords": "Errore",
+  "containers.SettingPage.addField" : "Aggiungi un nuovo campo",
+  "containers.SettingPage.attributes" : "Attributi",
+  "containers.SettingPage.attributes.description" : "Definisci l'ordine degli attributi",
+  "containers.SettingPage.listSettings.title" : "Lista - Impostazioni",
+  "containers.SettingPage.listSettings.description" : "Configura le opzioni per questo Tipo di Contenuto",
+  "containers.SettingPage.pluginHeaderDescription" : "Configura le impostazioni specifiche per questo Tipo di Contenuto",
+  "containers.SettingsPage.pluginHeaderDescription" : "Configura le impostazioni di default per tutti i tuoi Tipi di Contenuto",
+  "containers.SettingsPage.Block.generalSettings.description" : "Configura le opzioni di default per i Tipi di Contenuto",
+  "containers.SettingsPage.Block.generalSettings.title" : "Generali",
+  "containers.SettingsPage.Block.contentType.title" : "Tipi di Contenuto",
+  "containers.SettingsPage.Block.contentType.description" : "Configura le impostazioni specifiche",
   
 	"components.AddFilterCTA.add": "Filtri",
 	"components.AddFilterCTA.hide": "Filtri",
+  "components.DraggableAttr.edit" : "Clicca per modificare",
 	"components.FilterOptions.button.apply": "Applica",
 	"components.FiltersPickWrapper.PluginHeader.actions.apply": "Applica",
 	"components.FiltersPickWrapper.PluginHeader.actions.clearAll": "Cancella tutto",
 	"components.FiltersPickWrapper.PluginHeader.description": "Impostare le condizioni da applicare per filtrare le voci",
 	"components.FiltersPickWrapper.PluginHeader.title.filter": "Filtri",
   "components.FiltersPickWrapper.hide": "Nascondi",
-  
 	"components.FilterOptions.FILTER_TYPES.=": "si",
 	"components.FilterOptions.FILTER_TYPES._ne": "non è",
 	"components.FilterOptions.FILTER_TYPES._lt": "è inferiore",
@@ -59,6 +70,7 @@
 	"error.model.fetch": "Si è verificato un errore durante il caricamento dei modelli di configurazione.",
 	"error.validation.required": "Questo valore è richiesto.",
 	"error.validation.regex": "Il valore non corrisponde alla regex.",
+  "error.validation.json" : "Non è un JSON",
 	"error.validation.max": "Il valore è troppo alto.",
 	"error.validation.min": "Il valore è troppo basso.",
 	"error.validation.maxLength": "Il valore è troppo lungo.",
@@ -69,7 +81,19 @@
 	"error.attribute.sameKeyAndName": "Non può essere uguale",
   "error.validation.minSupMax": "Non può essere superiore",
   
+  "form.Input.label.inputDescription" : "Questo valore sovrascrive l'etichetta mostrata nell'intestazione della tabella",
+  "form.Input.label" : "Etichetta",
+  "form.Input.search" : "Abilita ricerca",
+  "form.Input.search.field" : "Abilita la ricerca su questo campo",
+  "form.Input.filters" : "Abilita filtri",
+  "form.Input.sort.field" : "Abilita ordinamento su questo campo",
+  "form.Input.bulkActions" : "Abilita caricamento",
+  "form.Input.pageEntries" : "Righe per pagina",
+  "form.Input.pageEntries.inputDescription" : "Attenzione: Puoi sovrascrivere questo valore nella pagina delle impostazioni del Tipo di Contenuto",
+  "form.Input.defaultSort" : "Attributo di ordinamento di default",
+  
   "notification.error.relationship.fetch": "Si è verificato un errore durante il rapporto di recupero.",
+  "notification.info.SettingPage.disableSort" : "E' necessario un attributo con l'ordinamento abilitato",
   
 	"success.record.delete": "Eliminato",
   "success.record.save": "Salvato",
@@ -80,5 +104,8 @@
 	"popUpWarning.button.confirm": "Conferma",
 	"popUpWarning.title": "Si prega di confermare",
 	"popUpWarning.bodyMessage.contentType.delete": "Sei sicuro di voler cancellare questa voce?",
-	"popUpWarning.bodyMessage.contentType.delete.all": "Sei sicuro di voler eliminare queste voci?"
-}
\ No newline at end of file
+	"popUpWarning.bodyMessage.contentType.delete.all": "Sei sicuro di voler eliminare queste voci?",
+  "popUpWarning.warning.cancelAllSettings" : "Sei sicuro di voler cancellare le tue modifiche?",
+  "popUpWarning.warning.updateAllSettings" : "Questa operazione modificherà tutte le tue impostazioni"
+  
+}
diff --git a/packages/strapi-plugin-content-manager/admin/src/translations/tr.json b/packages/strapi-plugin-content-manager/admin/src/translations/tr.json
index f818897df8..1ed9dfbc0c 100755
--- a/packages/strapi-plugin-content-manager/admin/src/translations/tr.json
+++ b/packages/strapi-plugin-content-manager/admin/src/translations/tr.json
@@ -15,15 +15,31 @@
   "components.LimitSelect.itemsPerPage": "Sayfa başı",
   "containers.List.errorFetchRecords": "Hata",
 
+  "containers.SettingPage.addField": "Yeni alan ekle",
+  "containers.SettingPage.attributes": "Nitelik alanları",
+  "containers.SettingPage.attributes.description": "Niteliklerin sırasını tanımlayın",
+
+  "containers.SettingPage.listSettings.title": "Liste — Ayarlar",
+  "containers.SettingPage.listSettings.description": "Bu içerik türü için seçenekleri yapılandırın",
+  "containers.SettingPage.pluginHeaderDescription": "Bu İçerik Türü için belirli ayarları yapılandırın",
+  "containers.SettingsPage.pluginHeaderDescription": "Tüm İçerik türleriniz için varsayılan ayarları yapılandırın",
+  "containers.SettingsPage.Block.generalSettings.description": "İçerik Türleriniz için varsayılan seçenekleri yapılandırın",
+  "containers.SettingsPage.Block.generalSettings.title": "Genel",
+  "containers.SettingsPage.Block.contentType.title": "İçerik Türleri",
+  "containers.SettingsPage.Block.contentType.description": "Belirli ayarları yapılandırın",
+
   "components.AddFilterCTA.add": "Filtreler",
   "components.AddFilterCTA.hide": "Filtreler",
-  "components.FilterOptions.button.apply": "Uygula",
+
+  "components.DraggableAttr.edit": "Düzenlemek için tıklayın",
+
   "components.FiltersPickWrapper.PluginHeader.actions.apply": "Uygula",
   "components.FiltersPickWrapper.PluginHeader.actions.clearAll": "Hepsini temizle",
   "components.FiltersPickWrapper.PluginHeader.description": "Filtrelemek için uygulanacak şartları ayarlayın",
   "components.FiltersPickWrapper.PluginHeader.title.filter": "Filtreler",
   "components.FiltersPickWrapper.hide": "Gizle",
 
+  "components.FilterOptions.button.apply": "Uygula",
   "components.FilterOptions.FILTER_TYPES.=": "eşit",
   "components.FilterOptions.FILTER_TYPES._ne": "eşit değil",
   "components.FilterOptions.FILTER_TYPES._lt": "daha düşük",
@@ -68,8 +84,21 @@
   "error.attribute.key.taken": "Bu değer zaten var.",
   "error.attribute.sameKeyAndName": "Eşit olamaz",
   "error.validation.minSupMax": "Üstü olamaz",
+  "error.validation.json": "Bu JSON biçimi ile eşleşmiyor",
+
+  "form.Input.label.inputDescription": "Bu değer, tablonun başında görüntülenen etiketi geçersiz kılar",
+  "form.Input.label": "Etiket",
+  "form.Input.search": "Aramayı etkinleştir",
+  "form.Input.search.field": "Bu alanda aramayı etkinleştir",
+  "form.Input.filters": "Filtreleri etkinleştir",
+  "form.Input.sort.field": "Bu alana göre sıralamayı etkinleştir",
+  "form.Input.bulkActions": "Toplu işlemleri etkinleştir",
+  "form.Input.pageEntries": "Sayfa başına kayıtlar",
+  "form.Input.pageEntries.inputDescription": "Not: Bu değeri İçerik Türü ayarları sayfasında geçersiz kılabilirsiniz..",
+  "form.Input.defaultSort": "Varsayılan sıralama özelliği",
 
   "notification.error.relationship.fetch": "İlişki getirme sırasında bir hata oluştu.",
+  "notification.info.SettingPage.disableSort": "Sıralamaya izin verilen tek bir özelliğe sahip olmanız gerekir",
 
   "success.record.delete": "Silindi",
   "success.record.save": "Kaydedildi",
@@ -80,5 +109,7 @@
   "popUpWarning.button.confirm": "Onayla",
   "popUpWarning.title": "Lütfen onaylayın",
   "popUpWarning.bodyMessage.contentType.delete": "Bu kaydı silmek istediğinizden emin misiniz?",
-  "popUpWarning.bodyMessage.contentType.delete.all": "Bu kayıtları silmek istediğinizden emin misiniz?"
+  "popUpWarning.bodyMessage.contentType.delete.all": "Bu kayıtları silmek istediğinizden emin misiniz?",
+  "popUpWarning.warning.cancelAllSettings": "Değişikliklerinizi iptal etmek istediğinizden emin misiniz?",
+  "popUpWarning.warning.updateAllSettings": "Bu bütün ayarlarınızı değiştirecektir"
 }
diff --git a/packages/strapi-plugin-content-manager/package.json b/packages/strapi-plugin-content-manager/package.json
index 82381522f7..39cdc52f5b 100755
--- a/packages/strapi-plugin-content-manager/package.json
+++ b/packages/strapi-plugin-content-manager/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-plugin-content-manager",
-  "version": "3.0.0-alpha.13",
+  "version": "3.0.0-alpha.13.0.1",
   "description": "A powerful UI to easily manage your data.",
   "strapi": {
     "name": "Content Manager",
@@ -28,7 +28,7 @@
     "react-dnd-html5-backend": "^5.0.1",
     "react-select": "^1.2.1",
     "showdown": "^1.8.6",
-    "strapi-helper-plugin": "3.0.0-alpha.13"
+    "strapi-helper-plugin": "3.0.0-alpha.13.0.1"
   },
   "author": {
     "name": "Strapi team",
diff --git a/packages/strapi-plugin-content-type-builder/package.json b/packages/strapi-plugin-content-type-builder/package.json
index cba78254dd..727a8d695c 100755
--- a/packages/strapi-plugin-content-type-builder/package.json
+++ b/packages/strapi-plugin-content-type-builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-plugin-content-type-builder",
-  "version": "3.0.0-alpha.13",
+  "version": "3.0.0-alpha.13.0.1",
   "description": "Strapi plugin to create content type (API).",
   "strapi": {
     "name": "Content Type Builder",
@@ -23,11 +23,11 @@
   },
   "dependencies": {
     "pluralize": "^7.0.0",
-    "strapi-generate": "3.0.0-alpha.13",
-    "strapi-generate-api": "3.0.0-alpha.13"
+    "strapi-generate": "3.0.0-alpha.13.0.1",
+    "strapi-generate-api": "3.0.0-alpha.13.0.1"
   },
   "devDependencies": {
-    "strapi-helper-plugin": "3.0.0-alpha.13"
+    "strapi-helper-plugin": "3.0.0-alpha.13.0.1"
   },
   "author": {
     "name": "Strapi team",
diff --git a/packages/strapi-plugin-email/package.json b/packages/strapi-plugin-email/package.json
index f52a5eb5f5..20cab4dc6d 100644
--- a/packages/strapi-plugin-email/package.json
+++ b/packages/strapi-plugin-email/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-plugin-email",
-  "version": "3.0.0-alpha.13",
+  "version": "3.0.0-alpha.13.0.1",
   "description": "This is the description of the plugin.",
   "strapi": {
     "name": "Email",
@@ -22,11 +22,11 @@
     "prepublishOnly": "IS_MONOREPO=true npm run build"
   },
   "dependencies": {
-    "strapi-email-sendmail": "3.0.0-alpha.13"
+    "strapi-email-sendmail": "3.0.0-alpha.13.0.1"
   },
   "devDependencies": {
     "react-copy-to-clipboard": "5.0.1",
-    "strapi-helper-plugin": "3.0.0-alpha.13"
+    "strapi-helper-plugin": "3.0.0-alpha.13.0.1"
   },
   "author": {
     "name": "Strapi team",
diff --git a/packages/strapi-plugin-graphql/package.json b/packages/strapi-plugin-graphql/package.json
index 80b22052a3..361dd4a40d 100644
--- a/packages/strapi-plugin-graphql/package.json
+++ b/packages/strapi-plugin-graphql/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-plugin-graphql",
-  "version": "3.0.0-alpha.13",
+  "version": "3.0.0-alpha.13.0.1",
   "description": "This is the description of the plugin.",
   "strapi": {
     "name": "graphql",
@@ -30,7 +30,7 @@
     "graphql-type-json": "^0.2.1",
     "graphql-type-datetime": "^0.2.2",
     "pluralize": "^7.0.0",
-    "strapi-utils": "3.0.0-alpha.13"
+    "strapi-utils": "3.0.0-alpha.13.0.1"
   },
   "author": {
     "name": "A Strapi developer",
@@ -49,4 +49,4 @@
     "npm": ">= 5.3.0"
   },
   "license": "MIT"
-}
\ No newline at end of file
+}
diff --git a/packages/strapi-plugin-settings-manager/package.json b/packages/strapi-plugin-settings-manager/package.json
index 2a760e11a2..33763835d5 100755
--- a/packages/strapi-plugin-settings-manager/package.json
+++ b/packages/strapi-plugin-settings-manager/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-plugin-settings-manager",
-  "version": "3.0.0-alpha.13",
+  "version": "3.0.0-alpha.13.0.1",
   "description": "Strapi plugin to manage settings.",
   "strapi": {
     "name": "Settings Manager",
@@ -25,7 +25,7 @@
   "devDependencies": {
     "flag-icon-css": "^2.8.0",
     "react-select": "^1.0.0-rc.5",
-    "strapi-helper-plugin": "3.0.0-alpha.13"
+    "strapi-helper-plugin": "3.0.0-alpha.13.0.1"
   },
   "author": {
     "name": "Strapi team",
diff --git a/packages/strapi-plugin-upload/package.json b/packages/strapi-plugin-upload/package.json
index de550356f9..46c67b8057 100644
--- a/packages/strapi-plugin-upload/package.json
+++ b/packages/strapi-plugin-upload/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-plugin-upload",
-  "version": "3.0.0-alpha.13",
+  "version": "3.0.0-alpha.13.0.1",
   "description": "This is the description of the plugin.",
   "strapi": {
     "name": "Files Upload",
@@ -23,12 +23,12 @@
   },
   "dependencies": {
     "react-copy-to-clipboard": "^5.0.1",
-    "strapi-upload-local": "3.0.0-alpha.13",
+    "strapi-upload-local": "3.0.0-alpha.13.0.1",
     "stream-to-array": "^2.3.0",
     "uuid": "^3.2.1"
   },
   "devDependencies": {
-    "strapi-helper-plugin": "3.0.0-alpha.13"
+    "strapi-helper-plugin": "3.0.0-alpha.13.0.1"
   },
   "author": {
     "name": "A Strapi developer",
diff --git a/packages/strapi-plugin-users-permissions/package.json b/packages/strapi-plugin-users-permissions/package.json
index c574975097..49a6cc2b7e 100644
--- a/packages/strapi-plugin-users-permissions/package.json
+++ b/packages/strapi-plugin-users-permissions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-plugin-users-permissions",
-  "version": "3.0.0-alpha.13",
+  "version": "3.0.0-alpha.13.0.1",
   "description": "Protect your API with a full-authentication process based on JWT",
   "strapi": {
     "name": "Roles & Permissions",
@@ -31,7 +31,7 @@
     "uuid": "^3.1.0"
   },
   "devDependencies": {
-    "strapi-helper-plugin": "3.0.0-alpha.13"
+    "strapi-helper-plugin": "3.0.0-alpha.13.0.1"
   },
   "author": {
     "name": "Strapi team",
diff --git a/packages/strapi-plugin-users-permissions/services/UsersPermissions.js b/packages/strapi-plugin-users-permissions/services/UsersPermissions.js
index 8064aa2aff..a8190c8ba8 100644
--- a/packages/strapi-plugin-users-permissions/services/UsersPermissions.js
+++ b/packages/strapi-plugin-users-permissions/services/UsersPermissions.js
@@ -88,7 +88,7 @@ module.exports = {
   },
 
   getPlugins: (plugin, lang = 'en') => {
-    return new Promise((resolve, reject) => {
+    return new Promise((resolve) => {
       request({
         uri: `https://marketplace.strapi.io/plugins?lang=${lang}`,
         json: true,
@@ -97,7 +97,7 @@ module.exports = {
         }
       }, (err, response, body) => {
         if (err) {
-          return reject(err);
+          return resolve([]);
         }
 
         resolve(body);
diff --git a/packages/strapi-upload-aws-s3/package.json b/packages/strapi-upload-aws-s3/package.json
index d763296024..2296da7660 100644
--- a/packages/strapi-upload-aws-s3/package.json
+++ b/packages/strapi-upload-aws-s3/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-upload-aws-s3",
-  "version": "3.0.0-alpha.13",
+  "version": "3.0.0-alpha.13.0.1",
   "description": "AWS S3 provider for strapi upload",
   "homepage": "http://strapi.io",
   "keywords": [
@@ -43,4 +43,4 @@
     "npm": ">= 5.3.0"
   },
   "license": "MIT"
-}
\ No newline at end of file
+}
diff --git a/packages/strapi-upload-cloudinary/package.json b/packages/strapi-upload-cloudinary/package.json
index 7e967b7379..7cf5eff3f2 100644
--- a/packages/strapi-upload-cloudinary/package.json
+++ b/packages/strapi-upload-cloudinary/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-upload-cloudinary",
-  "version": "3.0.0-alpha.13",
+  "version": "3.0.0-alpha.13.0.1",
   "description": "Cloudinary provider for strapi upload",
   "homepage": "http://strapi.io",
   "keywords": [
@@ -43,4 +43,4 @@
     "npm": ">= 5.3.0"
   },
   "license": "MIT"
-}
\ No newline at end of file
+}
diff --git a/packages/strapi-upload-local/package.json b/packages/strapi-upload-local/package.json
index de84a8539b..153f0a7c03 100644
--- a/packages/strapi-upload-local/package.json
+++ b/packages/strapi-upload-local/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-upload-local",
-  "version": "3.0.0-alpha.13",
+  "version": "3.0.0-alpha.13.0.1",
   "description": "Local provider for strapi upload",
   "homepage": "http://strapi.io",
   "keywords": [
@@ -39,4 +39,4 @@
     "npm": ">= 5.3.0"
   },
   "license": "MIT"
-}
\ No newline at end of file
+}
diff --git a/packages/strapi-upload-rackspace/package.json b/packages/strapi-upload-rackspace/package.json
index d517ef0ff1..173b67a7ea 100644
--- a/packages/strapi-upload-rackspace/package.json
+++ b/packages/strapi-upload-rackspace/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-upload-rackspace",
-  "version": "3.0.0-alpha.13",
+  "version": "3.0.0-alpha.13.0.1",
   "description": "Rackspace provider for strapi upload",
   "main": "./lib",
   "scripts": {
@@ -13,4 +13,4 @@
     "pkgcloud": "^1.5.0",
     "streamifier": "^0.1.1"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/strapi-utils/package.json b/packages/strapi-utils/package.json
index 5d7fa3af9a..50b33deb51 100755
--- a/packages/strapi-utils/package.json
+++ b/packages/strapi-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-utils",
-  "version": "3.0.0-alpha.13",
+  "version": "3.0.0-alpha.13.0.1",
   "description": "Shared utilities for the Strapi packages",
   "homepage": "http://strapi.io",
   "keywords": [
@@ -49,4 +49,4 @@
     "npm": ">= 5.3.0"
   },
   "license": "MIT"
-}
\ No newline at end of file
+}
diff --git a/packages/strapi/package.json b/packages/strapi/package.json
index 2b51644bc5..df76357a9b 100755
--- a/packages/strapi/package.json
+++ b/packages/strapi/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi",
-  "version": "3.0.0-alpha.13",
+  "version": "3.0.0-alpha.13.0.1",
   "description": "An open source solution to create and manage your own API. It provides a powerful dashboard and features to make your life easier.",
   "homepage": "http://strapi.io",
   "keywords": [
@@ -55,16 +55,16 @@
     "rimraf": "^2.6.2",
     "semver": "^5.4.1",
     "stack-trace": "0.0.10",
-    "strapi-generate": "3.0.0-alpha.13",
-    "strapi-generate-admin": "3.0.0-alpha.13",
-    "strapi-generate-api": "3.0.0-alpha.13",
-    "strapi-generate-controller": "3.0.0-alpha.13",
-    "strapi-generate-model": "3.0.0-alpha.13",
-    "strapi-generate-new": "3.0.0-alpha.13",
-    "strapi-generate-plugin": "3.0.0-alpha.13",
-    "strapi-generate-policy": "3.0.0-alpha.13",
-    "strapi-generate-service": "3.0.0-alpha.13",
-    "strapi-utils": "3.0.0-alpha.13"
+    "strapi-generate": "3.0.0-alpha.13.0.1",
+    "strapi-generate-admin": "3.0.0-alpha.13.0.1",
+    "strapi-generate-api": "3.0.0-alpha.13.0.1",
+    "strapi-generate-controller": "3.0.0-alpha.13.0.1",
+    "strapi-generate-model": "3.0.0-alpha.13.0.1",
+    "strapi-generate-new": "3.0.0-alpha.13.0.1",
+    "strapi-generate-plugin": "3.0.0-alpha.13.0.1",
+    "strapi-generate-policy": "3.0.0-alpha.13.0.1",
+    "strapi-generate-service": "3.0.0-alpha.13.0.1",
+    "strapi-utils": "3.0.0-alpha.13.0.1"
   },
   "author": {
     "email": "hi@strapi.io",
@@ -91,4 +91,4 @@
   },
   "preferGlobal": true,
   "license": "MIT"
-}
\ No newline at end of file
+}