Merge branch 'master' into openstreetbugs

Conflicts:
	app/controllers/browse_controller.rb

diff --cc app/controllers/browse_controller.rb
index d9b18769c37b934d8f77038c5884ee23418c9fe3,9aec1060a19b3c836e455c0abcc0dd36c79ec8cc..2962c6836a9a1a4f7e202c728a226e9a3f150ae0
--- 1/app/controllers/browse_controller.rb
--- 2/app/controllers/browse_controller.rb
+++ b/app/controllers/browse_controller.rb
@@@ -77,29 -77,4 +77,13 @@@ class BrowseController < ApplicationCon
    rescue ActiveRecord::RecordNotFound
      render :action => "not_found", :status => :not_found
    end
- 
- private
- 
-   def timeout
-     SystemTimer.timeout_after(30) do
-       yield
-     end
-   rescue ActionView::TemplateError => ex
-     if ex.original_exception.is_a?(Timeout::Error)
-       render :action => "timeout"
-     else
-       raise
-     end
-   rescue Timeout::Error
-     render :action => "timeout"
-   end
 +
 +  def bug
 +    @type = "bug"
 +    @bug = MapBug.find(params[:id])
 +    @next = MapBug.find(:first, :order => "id ASC", :conditions => [ "status != 'hidden' AND id > :id", { :id => @bug.id }] )
 +    @prev = MapBug.find(:first, :order => "id DESC", :conditions => [ "status != 'hidden' AND id < :id", { :id => @bug.id }] )
 +  rescue ActiveRecord::RecordNotFound
 +    render :action => "not_found", :status => :not_found
 +  end
  end

diff --cc config/environment.rb
Simple merge

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