Merge remote-tracking branch 'openlayers/master' into vector-api

examples/side-by-side.js

@@ -20,7 +20,7 @@ var domMap = new ol.Map({
   })
 });
 
-if (!ol.BrowserFeature.HAS_WEBGL) {
+if (ol.BrowserFeature.HAS_WEBGL) {
   var webglMap = new ol.Map({
     renderer: ol.RendererHint.WEBGL,
     target: 'webglMap'

package.json

@@ -14,6 +14,6 @@
     "url": "https://github.com/openlayers/ol3/issues"
   },
   "devDependencies": {
-    "closure-util": "*"
+    "closure-util": "~0.8.2"
   }
 }

tasks/serve.js

@@ -43,4 +43,8 @@ manager.on('ready', function() {
   server.listen(3000, function() {
     log.info('ol', 'Listening on http://localhost:3000/ (Ctrl+C to stop)');
   });
+  server.on('error', function(err) {
+    log.error('ol', 'Server failed to start: ' + err.message);
+    process.exit(1);
+  });
 });