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

Author: iurimatias

lib/contracts.js

@@ -79,7 +79,7 @@ ContractsManager.prototype.build = function(done) {
         contract.abiDefinition    = compiledContract.abiDefinition;
 
         contract.gas = (contractConfig && contractConfig.gas) || self.contractsConfig.gas;
-        contract.gas = adjustGas(contract);
+        adjustGas(contract);
 
         contract.gasPrice = contract.gasPrice || self.contractsConfig.gasPrice;
         contract.type = 'file';