Merge branch 'develop' of github.com:iurimatias/embark-framework into develop

Author: iurimatias

lib/index.js

@@ -151,7 +151,13 @@ var Embark = {
         });
       },
       function buildPipeline(abi, callback) {
-        var pipeline = new Pipeline({});
+        self.logger.trace("Building Assets");
+        var pipeline = new Pipeline({
+          buildDir: self.config.buildDir,
+          contractsFiles: self.config.contractsFiles,
+          assetFiles: self.config.assetFiles,
+          logger: self.logger
+        });
         pipeline.build(abi);
         callback();
       }
@@ -227,8 +233,8 @@ var Embark = {
     var self = this;
     async.waterfall([
       function buildAndDeploy(callback) {
-        Embark.buildAndDeploy(function(contractsManager) {
-          callback(null, contractsManager);
+        Embark.buildAndDeploy(function(err, contractsManager) {
+          callback(err, contractsManager);
         });
       },
       function generateABI(contractsManager, callback) {