Merge branch 'master' into webpack

Author: filipesilva

lib/broccoli/angular2-app.js

@@ -147,13 +147,6 @@ class Angular2App extends BroccoliPlugin {
       }));
     }
 
-    // Add the public folder in.
-    buildTrees.push(new BroccoliFunnel(this._inputNode, {
-      allowEmpty: true,
-      srcDir: 'public',
-      name: 'PublicFolderFunnel'
-    }));
-
     var merged = new BroccoliMergeTrees(buildTrees, { overwrite: true });
 
     if (this.ngConfig.apps[0].mobile) {
@@ -167,6 +160,15 @@ class Angular2App extends BroccoliPlugin {
       merged = this._getBundleTree(merged);
     }
 
+    // Public folder funnel 
+    var publicFolder =  new BroccoliFunnel(this._inputNode, {
+      allowEmpty: true,
+      srcDir: 'public',
+      name: 'PublicFolderFunnel'
+    });
+
+    merged = new BroccoliMergeTrees([merged, publicFolder]);
+
     return new BroccoliFunnel(merged, {
       destDir: this._destDir,
       overwrite: true