Merge remote-tracking branch 'upstream/master'

dist/build.txt

@@ -15,11 +15,12 @@ vendor/angular/angular-strap.js
 app/components/extend-jquery.js
 app/components/settings.js
 app/services/alertSrv.js
+app/components/kbn.js
+vendor/moment.js
 vendor/modernizr-2.6.1.js
 app/services/dashboard.js
 app/services/fields.js
 app/services/filterSrv.js
-vendor/moment.js
 app/services/kbnIndex.js
 app/services/querySrv.js
 app/services/timer.js
@@ -34,7 +35,6 @@ app/directives/dashUpload.js
 app/directives/kibanaPanel.js
 app/directives/ngBlur.js
 app/directives/ngModelOnBlur.js
-app/components/kbn.js
 app/directives/tip.js
 app/directives/all.js
 app/filters/all.js

src/app/services/dashboard.js

 define([
   'angular',
+  'jquery',
+  'kbn',
   'underscore',
   'config',
+  'moment',
   'modernizr'
 ],
-function (angular, _, config, Modernizr) {
+function (angular, $, kbn, _, config, moment, Modernizr) {
   'use strict';
 
   var module = angular.module('kibana.services');
@@ -284,8 +287,8 @@ function (angular, _, config, Modernizr) {
         method: "GET",
         transformResponse: function(response) {
           /*jshint -W054 */
-          var _f = new Function("ARGS",response);
-          return _f($routeParams);
+          var _f = new Function('ARGS','kbn','_','moment','window','document','angular','require','define','$','jQuery',response);
+          return _f($routeParams,kbn,_,moment);
         }
       }).then(function(result) {
         if(!result) {