Merge pull request #1501 from kalenjohnson/patch-2

Fix jQuery being compiled in main.js

assets/manifest.json

@@ -17,6 +17,9 @@
         "styles/editor-style.scss"
       ]
     },
+    "jquery.js": {
+      "bower": ["jquery"]
+    },
     "modernizr.js": {
       "bower": ["modernizr"]
     }