Merge branch 'master' into build-tweaks

Conflicts:
	dist/app/components/require.config.js
	src/app/components/require.config.js

src/app/app.js

@@ -10,7 +10,8 @@ define([
   'elasticjs',
   'bootstrap',
   'angular-sanitize',
-  'angular-strap'
+  'angular-strap',
+  'extend-jquery'
 ],
 function (angular, $, _, appLevelRequire) {
   "use strict";

src/app/components/extend-jquery.js

@@ -1,4 +1,4 @@
-define(['jquery-src'],
+define(['jquery'],
 function ($) {
   'use strict';
 

src/app/components/require.config.js

@@ -24,8 +24,10 @@ require.config({
     'underscore-src':         '../vendor/underscore',
     bootstrap:                '../vendor/bootstrap/bootstrap',
 
-    jquery:                   'components/jquery.extended',
-    'jquery-src':             '../vendor/jquery/jquery-1.8.0',
+    jquery:                   '../vendor/jquery/jquery-1.8.0',
+
+    'extend-jquery':          'components/extend-jquery',
+
     'jquery.flot':            '../vendor/jquery/jquery.flot',
     'jquery.flot.pie':        '../vendor/jquery/jquery.flot.pie',
     'jquery.flot.selection':  '../vendor/jquery/jquery.flot.selection',
@@ -53,7 +55,7 @@ require.config({
       exports: 'Modernizr'
     },
 
-    'jquery-src': {
+    jquery: {
       exports: 'jQuery'
     },
 

src/app/dashboards/logstash.js

@@ -137,7 +137,7 @@ dashboard.rows[0].panels = [
 // Add a filtering panel to the 3rd row
 dashboard.rows[1].panels = [
   {
-    type: 'Query'
+    type: 'query'
   }
 ];