Merge branch 'master' into notes

diff --cc app/assets/javascripts/index.js
index dc5c40bf2eb5d8af589c7885fa7de25077714f97,e96ffbf02cffa713776da79b0b3864e45e38863b..7c80b01081395726d6c57f3e602a42b7ac4f0bbc
--- 1/app/assets/javascripts/index.js
--- 2/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@@ -2,10 -2,9 +2,10 @@@
  //= require index/browse
  //= require index/export
  //= require index/key
 +//= require index/notes
  
  $(document).ready(function () {
-   var permalinks = $("#permalink").html();
+   var permalinks = $("#permalink").detach().html();
    var marker;
    var params = OSM.mapParams();
    var map = createMap("map");

diff --cc app/assets/stylesheets/common.css.scss
Simple merge

diff --cc app/helpers/application_helper.rb
Simple merge

diff --cc app/views/browse/_map.html.erb
index cf59a4679423395c7fc20a047ed5f2578404ff15,c72040955920c6100aecf44a2bb9695707779c0b..e0428b4ac938f6468fb64f2d10ab197ea9072b39
--- 1/app/views/browse/_map.html.erb
--- 2/app/views/browse/_map.html.erb
+++ b/app/views/browse/_map.html.erb
@@@ -39,20 -33,13 +39,20 @@@
  
  <ul class='secondary-actions clearfix'>
    <li>
 -    <%= link_to t("browse.map.larger.area"),
 -                root_path(:box => "yes"),
 -                :id => "area_larger_map",
 -                :class => "geolink bbox" %>
 +    <% if map.instance_of? Note -%>
 +      <%= link_to t("browse.map.larger.area"),
 +                  root_path(:notes => "yes"),
 +                  :id => "area_larger_map",
 +                  :class => "geolink bbox" %>
 +    <% else -%>
 +      <%= link_to t("browse.map.larger.area"),
 +                  root_path(:box => "yes"),
 +                  :id => "area_larger_map",
 +                  :class => "geolink bbox" %>
 +    <% end -%>
    </li>
    <li>
-     <%= link_to h(t("browse.map.edit.area")) + content_tag(:span, "â\96¾", :class => "menuicon"),
+     <%= link_to h(t("browse.map.edit.area")) + content_tag(:span, "â\96¼", :class => "menuicon"),
                  edit_path,
                  :id => "area_edit",
                  :data => { :editor => preferred_editor },

diff --cc app/views/user/view.html.erb
Simple merge

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

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

diff --cc test/functional/browse_controller_test.rb
Simple merge