Merge with master and solve conflicts

Gruntfile.js

@@ -87,7 +87,7 @@ module.exports = function(grunt) {
 
     copy: {
       jquery: {
-        src: 'bower_components/jquery/index.js',
+        src: 'bower_components/jquery/dist/jquery.min.js',
         dest: 'build/common/dep/jquery.min.js'
       },
       vendor: {
@@ -263,7 +263,7 @@ module.exports = function(grunt) {
             'dep/safari/openpgpjs/compression/rawdeflate.min.js',
             'dep/safari/openpgpjs/compression/rawdeflate.min.js.map'
           ],
-          dest: 'build/e2e-plugin.safariextension/dep/'
+          dest: 'build/e2e-plugin.safariextension/'
         },
         {
           expand: true,
@@ -292,7 +292,7 @@ module.exports = function(grunt) {
           expand: true,
           flatten: true,
           src: ['dep/chrome/openpgpjs/openpgp.js', 'dep/chrome/openpgpjs/openpgp.worker.js'],
-          dest: 'build/chrome/dep/'
+          dest: 'build/chrome/'
         },
         {
           expand: true,
@@ -321,7 +321,7 @@ module.exports = function(grunt) {
           expand: true,
           flatten: true,
           src: ['dep/firefox/openpgpjs/openpgp.js', 'dep/firefox/openpgpjs/openpgp.worker.js'],
-          dest: 'build/firefox/dep/'
+          dest: 'build/firefox/'
         },
         {
           expand: true,
@@ -350,7 +350,7 @@ module.exports = function(grunt) {
           expand: true,
           flatten: true,
           src: ['dep/edge/openpgpjs/openpgp.js', 'dep/edge/openpgpjs/openpgp.worker.js'],
-          dest: 'build/edge/Extension/dep/'
+          dest: 'build/edge/Extension/'
         },
         {
           expand: true,

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "porto",
-  "version": "4.1.0",
+  "version": "5.0.0",
   "description": "Porto is a browser extension library for Google Chrome,Firefox and Safari that allows to develop cross platform browser extension with ease.",
   "license": "ALS",
   "private": true,
@@ -12,14 +12,11 @@
     "tests"
   ],
   "dependencies": {
-    "jquery": "https://code.jquery.com/jquery-2.2.4.min.js",
-    "bootstrap": "~3.3.1",
+    "jquery": "3.3.1",
+    "bootstrap": "3.3.1",
     "requirejs": "2.1.14",
     "dompurify": "0.7.3",
-    "bootstrap-sortable": "~1.10.0",
+    "bootstrap-sortable": "1.10.0",
     "qrcodejs": "0.1.0"
-  },
-  "resolutions": {
-    "jquery": "e-tag:W/\"573f485"
   }
 }

chrome/background.js

@@ -5,7 +5,7 @@ var porto = porto || null;
 requirejs.config({
   baseUrl: 'lib', paths: {
     jquery: '../common/dep/jquery.min',
-    openpgp: '../dep/openpgp',
+    openpgp: '../openpgp',
     porto: '../common/ui/porto',
     parser_rules: '../common/dep/wysihtml5/js/advanced_parser_rules',
     dompurify: '../common/dep/purify'

chrome/manifest.json

@@ -1,7 +1,7 @@
 {
   "name": "__MSG_ext_name__",
-  "version": "4.2.0",
-  "version_name": "4.2.0",
+  "version": "5.0.0",
+  "version_name": "5.0.0",
   "description": "__MSG_ext_description__",
   "homepage_url":"https://subutai.io",
   "manifest_version": 2,