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

src/module/select.js

@@ -87,7 +87,13 @@ KityMinder.registerModule( "Select", function () {
                 }
             },
             mousemove: marqueeActivator.selectMove,
-            mouseup: marqueeActivator.selectEnd
+            mouseup: function ( e ) {
+                var clickNode = e.getTargetNode();
+                if ( clickNode && clickNode.isSelected() && !this.isSingleSelect() ) {
+                    this.select( clickNode, true );
+                }
+                marqueeActivator.selectEnd( e );
+            }
         }
     };
 } );
\ No newline at end of file

src/module/zoom.js

 KityMinder.registerModule( 'Zoom', function () {
-
+	/*
 	return {
 		events: {
 			'mousewheel': function ( e ) {
@@ -18,5 +18,6 @@ KityMinder.registerModule( 'Zoom', function () {
 				this._zoom = 1;
 			}
 		}
-	};
+	};*/
+	return {};
 } );
\ No newline at end of file