Merge branch 'master' into bugfix/staticGrid

# Conflicts:
#	dist/gridstack.min.map

src/gridstack.js

@@ -1121,7 +1121,7 @@
                 throw new Error('Invalid height');
             }
             heightUnit = match[2];
-            height = parseInt(match[1]);
+            height = parseFloat(match[1]);
         }
         return {height: height, unit: heightUnit};
     }