Merge branch 'master' into public/master

* master:
  BAP-7696: Update jsTree library

Author: michael-oro

composer.json

@@ -74,7 +74,8 @@
         "components/font-awesome": "~4.3.0",
         "piwik/device-detector": "~3.0",
         "oro/jsplumb": "~1.7",
-        "oro/moment-timezone": "0.3.*"
+        "oro/moment-timezone": "0.3.*",
+        "vakata/jstree": "^3.2"
     },
     "require-dev": {
         "sensio/generator-bundle": "2.5.3"