Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	dist/vis.js

lib/network/Edge.js

@@ -1164,7 +1164,7 @@ Edge.prototype.positionBezierNode = function() {
     this.via.x = 0.5 * (this.from.x + this.to.x);
     this.via.y = 0.5 * (this.from.y + this.to.y);
   }
-  else {
+  else if (this.via !== null) {
     this.via.x = 0;
     this.via.y = 0;
   }

lib/network/Network.js

@@ -45,7 +45,7 @@ function Network (container, data, options) {
   this.renderRefreshRate = 60;                         // hz (fps)
   this.renderTimestep = 1000 / this.renderRefreshRate; // ms -- saves calculation later on
   this.renderTime = 0;                                 // measured time it takes to render a frame
-  this.physicsTime = 0;                                 // measured time it takes to render a frame
+  this.physicsTime = 0;                                // measured time it takes to render a frame
   this.runDoubleSpeed = false;
   this.physicsDiscreteStepsize = 0.50;                 // discrete stepsize of the simulation