Merge pull request #28 from petougao/patch-1

Fix for headers where data is split to html and js

src/bootstrap-table.js

@@ -200,7 +200,7 @@
 
             columns.push(column);
         });
-        this.options.columns = $.extend(columns, this.options.columns);
+        this.options.columns = $.extend(true, columns, this.options.columns);
         $.each(this.options.columns, function(i, column) {
             that.options.columns[i] = $.extend({}, BootstrapTable.COLUMN_DEFAULTS, column);
         });