Merge branch 'master' into obersalzberg

# Conflicts:
#	dist/iwmlib.js
#	dist/iwmlib.pixi.js

lib/scatter.js

@@ -382,6 +382,7 @@ export class AbstractScatter extends Throwable {
         let delta = interaction.delta()
 
         if (delta != null) {
+            this.addVelocity(delta)  // uo: reverted commit fa0256d782dd498c6d3e51321260ca375ca9f855
             let rotate = delta.rotate
             let zoom = delta.zoom
             if (this.maxRotation != null) {
@@ -581,7 +582,7 @@ export class AbstractScatter extends Throwable {
     }
 
     _move(delta) {
-        this.addVelocity(delta)
+        // this.addVelocity(delta) uo: reverted commit fa0256d782dd498c6d3e51321260ca375ca9f855 
         this.x += this.movableX ? delta.x : 0
         this.y += this.movableX ? delta.y : 0
     }
@@ -1396,7 +1397,7 @@ export class DOMScatter extends AbstractScatter {
         }
         this._x = x
         this._y = y
-        this.addVelocity({ x: delta.x, y: delta.y })
+        // this.addVelocity({ x: delta.x, y: delta.y }) uo: reverted commit fa0256d782dd498c6d3e51321260ca375ca9f855
         TweenLite.set(this.element, { x, y })
     }