Merge branch 'master' into fresh-flow

Conflicts:
	app/assets/stylesheets/bootstrap_and_overrides.css.less

app/assets/stylesheets/bootstrap_and_overrides.css.less

@@ -104,6 +104,10 @@ table {
   td.odd {
     background-color: @tableBackgroundAccent;
   }
+  
+  td.main_info {
+    font-weight: bold;
+  }
 
   tr.selected td {
     background-color: @successBackground;
@@ -269,3 +273,44 @@ i.package {
 .input-nano {
   width: 30px;
 }
+
+// get rid of extra space on bottom of dialog with form
+.modal form {
+  margin: 0;
+}
+
+// multiple-column layout in forms (landscape tablet and wider only)
+@media (min-width: 768px) {
+  .form-horizontal .fold-line {
+    .control-group {
+      float: left;
+    }
+    .control-group + .control-group {
+      .control-label {
+        width: auto;
+        margin: 0 10px;
+      }
+      .controls {
+        float: left;
+        margin-left: 0;
+      }
+      // fix margin somehow off
+      // XXX there must be a better way
+      margin-bottom: 0;
+      .help-block {
+	margin-top: 0;
+        margin-bottom: 20px;
+      }
+    }
+    .control-group:last-child {
+      float: none;
+      .controls {
+        float: none;
+      }
+    }
+  }
+}
+// allow to have indicator text instead of input with same markup
+.control-text {
+  margin-top: 5px;
+}