Merge branch 'master' into sr_friendly_hidden_content

Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css

docs/assets/css/src/docs.css

@@ -1143,7 +1143,6 @@ h1[id] {
   margin-top: 0;
   margin-bottom: 0;
   word-break: normal;
-  word-wrap: nowrap;
   white-space: nowrap;
   background-color: transparent;
   border: 0;
@@ -1391,13 +1390,16 @@ h1[id] {
   margin-top: 0;
   margin-bottom: 5px;
 }
+.bs-dropzone hr {
+  width: 100px;
+}
 .bs-dropzone .lead {
   margin-bottom: 10px;
   font-weight: normal;
   color: #333;
 }
-.bs-dropzone hr {
-  width: 100px;
+/*.bs-dropzone*/ #import-manual-trigger {
+  cursor: pointer;
 }
 .bs-dropzone p:last-child {
   margin-bottom: 0;