Merge remote-tracking branch 'origin/master'

Author: aksonov

docs/API.md

@@ -117,7 +117,8 @@ Can use all `prop` as listed in `Scene` as `<Drawer>`, syntatic sugar for `<Scen
 | `drawerIcon` | `React.Component` |  | Arbitrary component to be used for drawer 'hamburger' icon, you have to set it together with `drawer` prop |
 | `hideDrawerButton` | `boolean` | `false` | Boolean to show or not the drawerImage or drawerIcon |
 | `drawerPosition` | `string`  | `left` | Determines whether the drawer is on the right or the left. Keywords accepted are `right` and `left` |
-| `drawerWidth` | `number`  |  | The width, in pixels, of the drawer (optional)
+| `drawerWidth` | `number`  |  | The width, in pixels, of the drawer (optional)|
+| `drawerLockMode` | enum('unlocked', 'locked-closed', 'locked-open')  |  | Specifies the lock mode of the drawer (https://facebook.github.io/react-native/docs/drawerlayoutandroid.html#drawerlockmode) |
 
 
 ## Modals (`<Modal>` or `<Scene modal>`)