Merge branch 'develop' into overview

src/test/test-main.js

-for (var file in window.__karma__.files) {
-  if (/spec\.js$/.test(file)) {
-    tests.push(file.replace(/^\/base\//, 'http://localhost:9876/base/'));
-  }
-}
-
 require.config({
 require.config({
   baseUrl: 'http://localhost:9876/base/app',
   baseUrl: 'http://localhost:9876/base/app',
 
 
@@ -93,7 +87,6 @@ require.config({
     'angular-loader':       ['angular'],
     'angular-loader':       ['angular'],
     'angular-mocks':        ['angular'],
     'angular-mocks':        ['angular'],
     'angular-resource':     ['angular'],
     'angular-resource':     ['angular'],
-    'angular-route':        ['angular'],
     'angular-touch':        ['angular'],
     'angular-touch':        ['angular'],
     'bindonce':             ['angular'],
     'bindonce':             ['angular'],
     'angular-strap':        ['angular', 'bootstrap','timepicker', 'datepicker'],
     'angular-strap':        ['angular', 'bootstrap','timepicker', 'datepicker'],
@@ -112,6 +105,13 @@ require([
 ], function(angular) {
 ], function(angular) {
   'use strict';
   'use strict';
 
 
+  for (var file in window.__karma__.files) {
+    if (/spec\.js$/.test(file)) {
+      window.tests.push(file.replace(/^\/base\//, 'http://localhost:9876/base/'));
+    }
+  }
+
+
   angular.module('grafana', ['ngRoute']);
   angular.module('grafana', ['ngRoute']);
   angular.module('grafana.services', ['ngRoute', '$strap.directives']);
   angular.module('grafana.services', ['ngRoute', '$strap.directives']);
   angular.module('grafana.panels', []);
   angular.module('grafana.panels', []);