Merge branch 'master' into external-plugins

Conflicts:
	public/app/plugins/panels/table/editor.ts
	public/views/index.html

public/app/core/settings.js

@@ -15,7 +15,6 @@ function (_) {
       appSubUrl: ""
     };
 
-    var settings = _.extend({}, defaults, options);
-    return settings;
+    return _.extend({}, defaults, options);
   };
 });