Merge branch 'develop' into 776_dist_remove

src/gridstack.js

@@ -1033,10 +1033,14 @@
             return;
         }
         var height = this.grid.getGridHeight();
-        var minHeight = parseInt(this.container.css('min-height')) / this.cellHeight();
+        // check for css min height. Each row is cellHeight + verticalMargin, until last one which has no margin below
+        var cssMinHeight = parseInt(this.container.css('min-height'));
+        if (cssMinHeight > 0) {
+            var minHeight = (cssMinHeight + this.opts.verticalMargin) / (this.cellHeight() + this.opts.verticalMargin);
             if (height < minHeight) {
                 height = minHeight;
             }
+        }
         this.container.attr('data-gs-current-height', height);
         if (!this.opts.cellHeight) {
             return ;