Merge branch 'master' into openstreetbugs

diff --cc app/controllers/browse_controller.rb
Simple merge

diff --cc app/views/browse/_map.html.erb
Simple merge

diff --cc app/views/site/index.html.erb
index 305df63c0fd3212a4c1e0d4cbd9f7b6e6e04d668,0a0b7c1da5e873a9e2a9a450dee08e963773d77a..70402a1c94014a89fcb9e72e49fd4d2bd929d727
--- 1/app/views/site/index.html.erb
--- 2/app/views/site/index.html.erb
+++ b/app/views/site/index.html.erb
@@@ -19,10 -19,12 +19,13 @@@
  <div id="map">
  </div>
  
+ <iframe id="linkloader" style="display: none">
+ </iframe>
+ 
  <div id="permalink">
    <a href="/" id="permalinkanchor"><%= t 'site.index.permalink' %></a><br/>
 -  <a href="/" id="shortlinkanchor"><%= t 'site.index.shortlink' %></a>
 +  <a href="/" id="shortlinkanchor"><%= t 'site.index.shortlink' %></a><br/>
 +  <a href="/" id="ReportBug">Report a problem</a>     
  </div>
  
  <div id="attribution">

diff --cc config/locales/en.yml
Simple merge