Merge branch 'master' into sortpriority

Author: dlgski

lib/grunt/plugins.js

@@ -331,9 +331,9 @@ module.exports = function(grunt) {
     fs.writeFileSync(bowerJsonFile, JSON.stringify(json, null, 2));
 
     // Add version for package.json
-    pkg.version = currentTag;
+    json.version = currentTag;
 
-    fs.writeFileSync(pkgJsonFile, JSON.stringify(pkg, null, 2));
+    fs.writeFileSync(pkgJsonFile, JSON.stringify(json, null, 2));
   });
 
   // Publish release to NPM

src/features/saveState/js/saveState.js

@@ -544,8 +544,9 @@
                 grid.api.core.raise.columnVisibilityChanged(currentCol);
               }
 
-              if ( grid.options.saveWidths ){
+              if ( grid.options.saveWidths && currentCol.width !== columnState.width){
                 currentCol.width = columnState.width;
+                currentCol.hasCustomWidth = true;
               }
 
               if ( grid.options.saveSort &&