Merge branch 'master' of github.com:swagger-api/swagger-ui into bug/3414-redo

# Conflicts:
#	src/core/json-schema-components.js
#	src/core/utils.js
#	src/style/_buttons.scss
#	src/style/_form.scss
#	src/style/_mixins.scss
#	test/core/utils.js

README.md

@@ -22,7 +22,7 @@ The OpenAPI Specification has undergone 4 revisions since initial creation in 20
 
 Swagger UI Version | Release Date | OpenAPI Spec compatibility | Notes | Status
 ------------------ | ------------ | -------------------------- | ----- | ------
-3.0.20              | 2017-07-21   | 2.0                        | [tag v3.0.20](https://github.com/swagger-api/swagger-ui/tree/v3.0.20) |
+3.0.21              | 2017-07-24   | 2.0                        | [tag v3.0.21](https://github.com/swagger-api/swagger-ui/tree/v3.0.21) |
 2.2.10             | 2017-01-04   | 1.1, 1.2, 2.0              | [tag v2.2.10](https://github.com/swagger-api/swagger-ui/tree/v2.2.10) |
 2.1.5              | 2016-07-20   | 1.1, 1.2, 2.0              | [tag v2.1.5](https://github.com/swagger-api/swagger-ui/tree/v2.1.5) |
 2.0.24             | 2014-09-12   | 1.1, 1.2 | [tag v2.0.24](https://github.com/swagger-api/swagger-ui/tree/v2.0.24) |

dist/swagger-ui-bundle.js.map

@@ -1 +1 @@
-{"version":3,"file":"swagger-ui-bundle.js","sources":["webpack:///swagger-ui-bundle.js"],"mappings":"AAAA;;;;;AAsyKA;;;;;;AA4uEA;;;;;;;;;;;;;;;;;;;;;;;;;;AAkqTA;;;;;;;;;;;;;;AA+5JA;;;;;;;;;AAmwnBA;;;;;AA+kQA;;;;;;AA+gXA","sourceRoot":""}
+{"version":3,"file":"swagger-ui-bundle.js","sources":["webpack:///swagger-ui-bundle.js"],"mappings":"AAAA;;;;;AAsyKA;;;;;;AAmtEA;;;;;;;;;;;;;;;;;;;;;;;;;;AAkqTA;;;;;;;;;;;;;;AA+5JA;;;;;;;;;AAkwnBA;;;;;AA6kQA;;;;;;AA+gXA","sourceRoot":""}

dist/swagger-ui.js.map

@@ -1 +1 @@
-{"version":3,"file":"swagger-ui.js","sources":["webpack:///swagger-ui.js"],"mappings":"AAAA;;;;;;AAw8aA","sourceRoot":""}
+{"version":3,"file":"swagger-ui.js","sources":["webpack:///swagger-ui.js"],"mappings":"AAAA;;;;;;AA46aA","sourceRoot":""}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "swagger-ui",
-  "version": "3.0.20",
+  "version": "3.0.21",
   "main": "dist/swagger-ui.js",
   "repository": "git@github.com:swagger-api/swagger-ui.git",
   "contributors": [

src/core/components/layout-utils.jsx

@@ -129,8 +129,7 @@ export class Select extends React.Component {
     value: PropTypes.any,
     onChange: PropTypes.func,
     multiple: PropTypes.bool,
-    allowEmptyValue: PropTypes.bool,
+    allowEmptyValue: PropTypes.bool
-    className: PropTypes.string
   }
 
   static defaultProps = {
@@ -143,7 +142,7 @@ export class Select extends React.Component {
 
     let value
 
-    if (props.value) {
+    if (props.value !== undefined) {
       value = props.value
     } else {
       value = props.multiple ? [""] : ""
@@ -179,7 +178,7 @@ export class Select extends React.Component {
     let value = this.state.value.toJS ? this.state.value.toJS() : this.state.value
 
     return (
-      <select className={this.props.className} multiple={ multiple } value={ value } onChange={ this.onChange } >
+      <select multiple={ multiple } value={ value } onChange={ this.onChange } >
         { allowEmptyValue ? <option value="">--</option> : null }
         {
           allowedValues.map(function (item, key) {

src/style/_table.scss

@@ -97,10 +97,6 @@ table
         width: 100%;
         max-width: 340px;
     }
-
-    select {
-        border-width: 1px;
-    }
 }
 
 .parameter__name