* Added missing utils import in serve

* Updated changelog for 0.4.1

CHANGELOG.MD

@@ -1,3 +1,5 @@
+* 0.4.1
+  * added the "browserSync" option, which lets you customize all BrowserSync settings (thanks @aaronroberson)
 * 0.4.0
   * fixed an issue with production styles bundle (fixes #96)
   * upgraded babel dependencies

README.md

@@ -719,6 +719,7 @@ Available options:
   * you can disable it by setting this option to false
 * browserSync
 	* Pass in browserSync options. See http://www.browsersync.io/docs/options/
+	* this should be defined like this: "browserSync": { // BrowserSync options }
 
 ## FAQ
 

UPGRADE.MD

@@ -1,5 +1,8 @@
 # Upgrade guide
 
+## From 0.4.0 to 0.4.1
+No modification mandatory with this release.
+
 ## From 0.3.2 to 0.4.0
 The way we construct the dist vendor css bundle has changed.
 In your vendor.scss file, if you import third party stylesheets from jspm_packages or from node_modules, then you'll need to change the relative path.

src/gulp/tasks/serve.js

@@ -2,7 +2,7 @@
 
 import AbstractTaskLoader from "../abstractTaskLoader";
 import config from "../config";
-//import utils from "../utils";
+import utils from "../utils";
 
 let browserSync = require("browser-sync").create(config.webServerNames.dev);
 

src/gulp/utils.js

@@ -157,13 +157,13 @@ let mergeOptions = (obj1 = {}, obj2 = {}) =>{
 	let obj3 = {};
 
 	for(let attrname in obj1){
-		if(obj1.hasOwnProperty(attrname)) {
+		if(obj1.hasOwnProperty(attrname)){
 			obj3[attrname] = obj1[attrname];
 		}
 	}
 
 	for(let attrname in obj2){
-		if(obj2.hasOwnProperty(attrname)) {
+		if(obj2.hasOwnProperty(attrname)){
 			obj3[attrname] = obj2[attrname];
 		}
 	}