Merge branch 'master' into notes

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/common.css.scss
	app/helpers/application_helper.rb

diff --cc Gemfile
index ce13c6532c9d73bf406be88111c9060e487c3936,1b35b6074c0a4283c6ca359c9aa1b4eeedee61de..4b2d2ba9e0351ce6d7e2de3ab2ad17fbc1115498
--- 1/Gemfile
--- 2/Gemfile
+++ b/Gemfile
@@@ -25,7 -28,7 +28,8 @@@ gem 'http_accept_language', '>= 1.0.2
  gem 'paperclip', '~> 2.0'
  gem 'deadlock_retry', '>= 1.2.0'
  gem 'i18n-js', '>= 3.0.0.rc2'
+ gem 'rack-cors'
 +gem 'jsonify-rails'
  
  # We need ruby-openid 2.2.0 or later for ruby 1.9 support
  gem 'ruby-openid', '>= 2.2.0'

diff --cc Gemfile.lock
index 23eeceb19c1dd026a469045c5e86298c56aab07f,7292a7141e1611002396da34e75a592ad0cac31f..eafd5d341a16a4ba61ad384214e5ce40c3cc6f78
--- 1/Gemfile.lock
--- 2/Gemfile.lock
+++ b/Gemfile.lock
@@@ -79,8 -74,8 +79,8 @@@ GE
        treetop (~> 1.4.8)
      memcached (1.4.6)
      mime-types (1.19)
-     minitest (4.1.0)
-     multi_json (1.3.6)
 -    minitest (4.2.0)
++    minitest (4.3.0)
+     multi_json (1.3.7)
      multipart-post (1.1.5)
      nokogiri (1.5.5)
      oauth (0.4.7)
@@@ -131,15 -129,15 +134,15 @@@
        rake (>= 0.8.7)
        rdoc (~> 3.4)
        thor (>= 0.14.6, < 2.0)
-     rake (0.9.2.2)
 -    rake (10.0.0)
++    rake (10.0.2)
      rdoc (3.12)
        json (~> 1.4)
-     redcarpet (2.2.1)
+     redcarpet (2.2.2)
      rinku (1.7.2)
-     ruby-openid (2.2.1)
+     ruby-openid (2.2.2)
      sanitize (2.0.3)
        nokogiri (>= 1.4.4, < 1.6)
-     sass (3.2.1)
+     sass (3.2.3)
      sass-rails (3.2.5)
        railties (~> 3.2.0)
        sass (>= 3.1.10)

diff --cc app/assets/javascripts/osm.js.erb
Simple merge

diff --cc app/assets/stylesheets/common.css.scss
index d41dd5481bb7df4e6c9d0443da576f74e75eead8,2837270fdf654fd035841a0b6b29dc08c7cab25c..ec06997f8fc0bf4f93200d7a312e004b68b5878f
--- 1/app/assets/stylesheets/common.css.scss
--- 2/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@@ -424,12 -460,18 +460,24 @@@ body.site-export #tabnav a#exportancho
    padding: 5px;
  }
  
 +#permalink a.disabled {
 +  color: #ccc;
 +  cursor: default;
 +  text-decoration: none;
 +}
 +
+ .site-index #map .SimpleLayerSwitcher,
+ .site-index #map .olControlSimplePanZoom,
+ .site-export #map .SimpleLayerSwitcher,
+ .site-export #map .olControlSimplePanZoom {
+   top: 40px !important;
+ }
+ 
+ .site-index #map .olControlScaleLine,
+ .site-export #map .olControlScaleLine {
+   left: 10px !important;
+ }
+ 
  /* Rules for edit menu */
  
  .menuicon {
@@@ -750,25 -825,11 +831,28 @@@ table.browse_details th 
    white-space: nowrap;
  }
  
 +td.browse_comments {
 +  padding: 0px;
 +}
 +
 +td.browse_comments table {
 +  border-collapse: collapse;
 +}
 +
 +td.browse_comments table td {
 +  padding-bottom: 10px;
 +}
 +
 +td.browse_comments table td span.by {
 +  font-size: small;
 +  color: #999999;
 +}
 +
  #browse_map {
+   float: right;
    width: 250px;
+   text-align: right;
+   margin-left: 10px;
  }
  
  #browse_map #small_map {

diff --cc app/helpers/application_helper.rb
index fb422cc17ead31643db19b04a2f55a9f358f5a85,000677646f58c0ab587b2a6c1b9647fc03fb80c8..18f233e506092d05d9e89ac302b8376ff2d021cb
--- 1/app/helpers/application_helper.rb
--- 2/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@@ -88,15 -88,11 +88,23 @@@ module ApplicationHelpe
      end
    end
  
+   def dir
+     if dir = params[:dir]
+       dir == "rtl" ? "rtl" : "ltr"
+     else
+       I18n.t("html.dir")
+     end
+   end
++
 +  def friendly_date(date)
 +    content_tag(:span, time_ago_in_words(date), :title => l(date, :format => :friendly))
 +  end
 +
 +  def note_author(object, link_options = {})
 +    if object.author.nil?
 +      h(object.author_name)
 +    else
 +      link_to h(object.author_name), link_options.merge({:controller => "user", :action => "view", :display_name => object.author_name})
 +    end
 +  end
  end

diff --cc app/models/notifier.rb
Simple merge

diff --cc app/models/user.rb
Simple merge

diff --cc app/views/site/index.html.erb
Simple merge

diff --cc config/example.application.yml
Simple merge

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

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

diff --cc db/structure.sql
Simple merge