Merge branch 'master' into openstreetbugs

Conflicts:
	app/views/site/index.html.erb

diff --cc app/views/site/index.html.erb
index fc1e1ec5cba597128c72ccebd3fdc6ed041e07c7,a89212238a26e7706b18a3239b711b284a700abe..305df63c0fd3212a4c1e0d4cbd9f7b6e6e04d668
--- 1/app/views/site/index.html.erb
--- 2/app/views/site/index.html.erb
+++ b/app/views/site/index.html.erb
@@@ -17,12 -17,12 +17,13 @@@
  </noscript>
  
  <div id="map">
-   <div id="permalink">
-     <a href="/" id="permalinkanchor"><%= t 'site.index.permalink' %></a><br/>
-     <a href="/" id="shortlinkanchor"><%= t 'site.index.shortlink' %></a><br/>
-       <a id="ReportBug">Report a problem</a>  
-   </div>
- </div> 
+ </div>
+ 
+ <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">
    <table width="100%">

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

diff --cc config/routes.rb
Simple merge