Merge branch 'develop' of github.com:martini/zammad into develop

app/assets/javascripts/app/views/widget/organization.jst.eco

@@ -32,6 +32,7 @@
       <a href="<%- user.uiUrl() %>" class="userList-name user-popover" data-id="<%- user.id %>">
         <%= user.displayName() %>
       </a>
+    </div>
 <% end %>
   </div>
 </div>

app/assets/stylesheets/bootstrap.css

@@ -1738,18 +1738,6 @@ input[type="search"] {
   font-weight: normal;
   cursor: pointer;
 }
-.radio input[type="radio"],
-.radio-inline input[type="radio"],
-.checkbox input[type="checkbox"],
-.checkbox-inline input[type="checkbox"] {
-  position: absolute;
-  margin-top: 4px \9;
-  margin-left: -20px;
-}
-.radio + .radio,
-.checkbox + .checkbox {
-  margin-top: -5px;
-}
 .radio-inline,
 .checkbox-inline {
   display: inline-block;

app/assets/stylesheets/zammad.scss

@@ -5939,7 +5939,7 @@ footer {
 }
 
 .checkbox.form-group .controls label {
-  padding: 3px 0 3px 20px;
+  padding: 2px 0;
   font: inherit;
   font-size: 13px;
   margin-bottom: 0;
@@ -5949,11 +5949,6 @@ footer {
   @extend .u-clickable;
 }
 
-.checkbox.form-group input[type=checkbox] {
-  margin-top: 7px;
-  vertical-align: bottom;
-}
-
 .userSearch-label {
   margin: 11px 10px 0 0;
 }