Merge branch 'sorting-dropdown-does-not-fit-filter-bar' into 'master'

Reduce margin to fit dropdowns

![Screen_Shot_2016-01-18_at_7.51.23_PM](/uploads/03336f86fde25d6d045742297a19751c/Screen_Shot_2016-01-18_at_7.51.23_PM.png)

Fixes #10747 

See merge request !2492

app/assets/stylesheets/framework/filters.scss

 .filter-item {
-  margin-right: 15px;
+  margin-right: 6px;
 }
 
 @media (min-width: 800px)  {