fix conflicts

Author: AllenFang

CHANGELOG.md

@@ -1,3 +1,16 @@
+<a name="v3.3.9"></a>
+# [v3.3.9](https://github.com/AllenFang/react-bootstrap-table/compare/v3.3.8...v3.3.9) (2017-06-08)
+## Bug fixes
+* Fixed TypeError: this.props.children.filter is not a function([80fb5a6](https://github.com/AllenFang/react-bootstrap-table/commit/80fb5a69cee6ce4357bbb11128f2fbc19c4300e1))
+
+<a name="v3.3.8"></a>
+# [v3.3.8](https://github.com/AllenFang/react-bootstrap-table/compare/v3.3.7...v3.3.8) (2017-06-02)
+## Bug fixes
+* `currSizePerPage` should be string([6c6185d](https://github.com/AllenFang/react-bootstrap-table/commit/6c6185d6d5f06e66ce03c304a6f5d1bb85563935))
+
+## Enhancement
+* allow `options.prePage`, `options.nextPage`, `options.firstPage` and `options.lastPage` to accept any type([a2ab8fb](https://github.com/AllenFang/react-bootstrap-table/commit/a2ab8fbaba2a072403fcc467b5f7d7cf8e0de0e7))
+
 <a name="v3.3.7"></a>
 # [v3.3.7](https://github.com/AllenFang/react-bootstrap-table/compare/v3.3.6...v3.3.7) (2017-05-22)
 ## Enhancement

dist/react-bootstrap-table.js

@@ -1275,8 +1275,9 @@ class BootstrapTable extends Component {
         }
       }
     } else {
-      React.Children.forEach(this.props.children.filter(_ => !!_), (child, i) => {
-        if (child.props.width) {
+      // debugger;
+      React.Children.forEach(this.props.children, (child, i) => {
+        if (child && child.props.width) {
           header[i].style.width = `${child.props.width}px`;
           header[i].style.minWidth = `${child.props.width}px`;
         }
@@ -1441,10 +1442,10 @@ BootstrapTable.propTypes = {
     noDataText: PropTypes.oneOfType([ PropTypes.string, PropTypes.object ]),
     withoutNoDataText: PropTypes.bool,
     handleConfirmDeleteRow: PropTypes.func,
-    prePage: PropTypes.string,
-    nextPage: PropTypes.string,
-    firstPage: PropTypes.string,
-    lastPage: PropTypes.string,
+    prePage: PropTypes.any,
+    nextPage: PropTypes.any,
+    firstPage: PropTypes.any,
+    lastPage: PropTypes.any,
     prePageTitle: PropTypes.string,
     nextPageTitle: PropTypes.string,
     firstPageTitle: PropTypes.string,

dist/react-bootstrap-table.js.map

@@ -150,7 +150,7 @@ class PaginationList extends Component {
       dropdown = sizePerPageDropDown({
         open: this.state.open,
         hideSizePerPage,
-        currSizePerPage: sizePerPage,
+        currSizePerPage: String(sizePerPage),
         sizePerPageList,
         toggleDropDown: this.toggleDropDown,
         changeSizePerPage: this.changeSizePerPage