Merge branch 'herrcykel-common-js-fix' into develop

package.json

@@ -2,7 +2,7 @@
   "name": "bootstrap-table",
   "description": "An extended Bootstrap table with radio, checkbox, sort, pagination, and other added features. (supports twitter bootstrap v2 and v3).",
   "version": "1.11.0",
-  "main": "Gruntfile.js",
+  "main": "./dist/bootstrap-table.js",
   "directories": {
     "doc": "docs"
   },