Merge branch 'master' into testing

1 files changed, 4 insertions, 4 deletions

diff --git a/ext/bg/search.html b/ext/bg/search.html
index 668b2436..3284ed43 100644
--- a/ext/bg/search.html
+++ b/ext/bg/search.html
@@ -20,7 +20,7 @@
             <form class="input-group" style="padding-top: 10px;">
                 <input type="text" class="form-control" placeholder="Search for..." id="query" autofocus>
                 <span class="input-group-btn">
-                    <input type="submit" class="btn btn-default form-control" id="search" value="Search" disabled>
+                    <input type="submit" class="btn btn-default form-control" id="search" value="Search">
                 </span>
             </form>
 
@@ -36,14 +36,14 @@
 
         <script src="/mixed/js/extension.js"></script>
 
-        <script src="/bg/js/api.js"></script>
-        <script src="/bg/js/audio.js"></script>
         <script src="/bg/js/dictionary.js"></script>
         <script src="/bg/js/handlebars.js"></script>
         <script src="/bg/js/templates.js"></script>
-        <script src="/bg/js/util.js"></script>
+        <script src="/fg/js/api.js"></script>
         <script src="/fg/js/document.js"></script>
         <script src="/fg/js/source.js"></script>
+        <script src="/fg/js/util.js"></script>
+        <script src="/mixed/js/audio.js"></script>
         <script src="/mixed/js/display.js"></script>
         <script src="/mixed/js/japanese.js"></script>
         <script src="/mixed/js/scroll.js"></script>