Merge branch 'master' into 'master'

Fixed width of .search-location-badge as it was causing issues in Safari.

Fixed width of .search-location-badge as it was causing issues in Safari.

Fixes issue #15541 and is a minor CSS only change so [ci skip]

# Before

Safari:
![Screen_Shot_2016-04-24_at_22.35.38](/uploads/74388670fde3af94429d83b954833bd3/Screen_Shot_2016-04-24_at_22.35.38.png)

# After

Safari:
![Screen_Shot_2016-04-24_at_21.59.49](/uploads/177d0d8fda665165dff5006930604fc6/Screen_Shot_2016-04-24_at_21.59.49.png)

Chrome:
![Screen_Shot_2016-04-24_at_21.59.40](/uploads/6764cd5864901210f4f8eff4388fd6db/Screen_Shot_2016-04-24_at_21.59.40.png)

# CSS class referenced in the following files:

`./app/assets/javascripts/search_autocomplete.js.coffee`

`./app/assets/stylesheets/pages/search.scss`

…and is visible on the search bar on every page.

See merge request !3900

app/assets/stylesheets/pages/search.scss

@@ -159,7 +159,7 @@
 
   &.has-location-badge {
     .search-input-wrap {
-      width: 78%;
+      width: 68%;
     }
   }
 }