Merge branch 'master' into external-plugins

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

tasks/options/concat.js

@@ -27,7 +27,7 @@ module.exports = function(config) {
     js: {
       src: [
         '<%= tempDir %>/vendor/requirejs/require.js',
-        '<%= tempDir %>/app/components/require.config.js',
+        '<%= tempDir %>/app/require_config.js',
         '<%= tempDir %>/app/app.js',
       ],
       dest: '<%= genDir %>/app/app.js'