Merge branch 'master' into webpack-frontend

bower.json

@@ -20,20 +20,19 @@
     "Ionicons": "ionicons#~2.0.1",
     "reveal.js": "~3.3.0",
     "spin.js": "~2.3.2",
-    "moment": "~2.14.1",
+    "moment": "~2.15.1",
     "handlebars": "~4.0.5",
     "js-yaml": "~3.6.1",
-    "raphael": "~2.2.1",
-    "xss": "~0.2.13",
+    "raphael": "~2.2.6",
     "mermaid": "^6.0.0",
     "MathJax": "^2.6.1",
     "octicons": "~3.5.0",
-    "velocity": "^1.2.3",
+    "velocity": "^1.3.1",
     "randomcolor": "randomColor#^0.4.4",
     "Idle.Js": "idle.js#^1.0.0",
     "gist-embed": "*"
   },
   "resolutions": {
-    "jquery": "~3.1.0"
+    "jquery": "~3.1.1"
   }
 }