Merge branch 'master' into external-plugins

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

tasks/build_task.js

@@ -13,7 +13,7 @@ module.exports = function(grunt) {
     'karma:test',
     'phantomjs',
     'css',
-    'htmlmin:build',
+    // 'htmlmin:build',
     'ngtemplates',
     'cssmin:build',
     'ngAnnotate:build',
@@ -34,8 +34,8 @@ module.exports = function(grunt) {
 
     for(var key in summary){
       if(summary.hasOwnProperty(key)){
-        var orig = key.replace(root, root+'/[[.AppSubUrl]]');
-        var revved = summary[key].replace(root, root+'/[[.AppSubUrl]]');
+        var orig = key.replace(root, root+'/[[.AppSubUrl]]/public');
+        var revved = summary[key].replace(root, root+'/[[.AppSubUrl]]/public');
         fixed[orig] = revved;
       }
     }

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'