Merge branch 'master' into openstreetbugs

Conflicts:
	app/views/browse/_map.html.erb
	app/views/site/index.html.erb
	config/initializers/mime_types.rb
	config/routes.rb
	lib/map_boundary.rb
	lib/migrate.rb
	lib/osm.rb
	vendor/assets/openlayers/OpenLayers.js

.gitignore

@@ -1,3 +1,4 @@
 log
+public/assets
 tmp
 .DS_Store

Gemfile

@@ -0,0 +1,52 @@
+# Gem source to use
+source 'http://rubygems.org'
+
+# Require rails
+gem 'rails', '3.1.3'
+
+# Require the postgres database driver
+gem 'pg'
+
+# Load jquery support
+gem 'jquery-rails'
+
+# Load rails plugins
+gem 'rails-i18n-updater'
+gem 'dynamic_form'
+gem 'rinku', '>= 1.2.2', :require => 'rails_rinku'
+gem 'oauth-plugin', '>= 0.4.0.pre7'
+gem 'open_id_authentication', '>= 1.1.0'
+gem 'validates_email_format_of', '>= 1.5.1'
+gem 'composite_primary_keys', '>= 4.1.1'
+
+# Load libxml support for XML parsing and generation
+gem 'libxml-ruby', '>= 2.0.5', :require => 'libxml'
+
+# Load ImageMagick support for user picture resizing
+gem 'rmagick', :require => 'RMagick'
+
+# Load HTML sanitizer
+gem 'sanitize'
+
+# Load SystemTimer for implementing request timeouts
+gem 'SystemTimer', '>= 1.1.3', :require => 'system_timer', :platforms => :ruby_18
+
+# Load httpclient for SOAP support for Quova GeoIP queries
+gem 'httpclient'
+
+# Load memcache in case we are using it
+gem 'memcache-client'
+gem 'memcached'
+
+# Gems needed for running tests
+group :test do
+  gem 'timecop'
+end
+
+# Gems needed for compiling assets
+group :assets do
+  gem 'sass-rails', "  ~> 3.1.0"
+  gem 'coffee-rails', "~> 3.1.0"
+  gem 'uglifier'
+  gem 'therubyracer'
+end

Gemfile.lock

@@ -0,0 +1,173 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    SystemTimer (1.2.3)
+    actionmailer (3.1.3)
+      actionpack (= 3.1.3)
+      mail (~> 2.3.0)
+    actionpack (3.1.3)
+      activemodel (= 3.1.3)
+      activesupport (= 3.1.3)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6)
+      rack (~> 1.3.5)
+      rack-cache (~> 1.1)
+      rack-mount (~> 0.8.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.0.3)
+    activemodel (3.1.3)
+      activesupport (= 3.1.3)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.3)
+      activemodel (= 3.1.3)
+      activesupport (= 3.1.3)
+      arel (~> 2.2.1)
+      tzinfo (~> 0.3.29)
+    activeresource (3.1.3)
+      activemodel (= 3.1.3)
+      activesupport (= 3.1.3)
+    activesupport (3.1.3)
+      multi_json (~> 1.0)
+    addressable (2.2.6)
+    arel (2.2.1)
+    builder (3.0.0)
+    coffee-rails (3.1.1)
+      coffee-script (>= 2.2.0)
+      railties (~> 3.1.0)
+    coffee-script (2.2.0)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.1.3)
+    composite_primary_keys (4.1.1)
+      activerecord (~> 3.1)
+    dynamic_form (1.1.4)
+    erubis (2.7.0)
+    execjs (1.2.9)
+      multi_json (~> 1.0)
+    faraday (0.7.5)
+      addressable (~> 2.2.6)
+      multipart-post (~> 1.1.3)
+      rack (< 2, >= 1.1.0)
+    hike (1.2.1)
+    httpclient (2.2.3)
+    i18n (0.6.0)
+    jquery-rails (1.0.18)
+      railties (~> 3.0)
+      thor (~> 0.14)
+    json (1.6.1)
+    libv8 (3.3.10.4)
+    libxml-ruby (2.2.2)
+    mail (2.3.0)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    memcache-client (1.8.5)
+    memcached (1.3.5)
+    mime-types (1.17.2)
+    multi_json (1.0.3)
+    multipart-post (1.1.3)
+    nokogiri (1.5.0)
+    oauth (0.4.5)
+    oauth-plugin (0.4.0.rc2)
+      multi_json
+      oauth (~> 0.4.4)
+      oauth2
+      rack
+    oauth2 (0.5.1)
+      faraday (~> 0.7.4)
+      multi_json (~> 1.0.3)
+    open_id_authentication (1.1.0)
+      rack-openid (~> 1.3)
+    pg (0.11.0)
+    polyglot (0.3.3)
+    rack (1.3.5)
+    rack-cache (1.1)
+      rack (>= 0.4)
+    rack-mount (0.8.3)
+      rack (>= 1.0.0)
+    rack-openid (1.3.1)
+      rack (>= 1.1.0)
+      ruby-openid (>= 2.1.8)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
+      rack (>= 1.0)
+    rails (3.1.3)
+      actionmailer (= 3.1.3)
+      actionpack (= 3.1.3)
+      activerecord (= 3.1.3)
+      activeresource (= 3.1.3)
+      activesupport (= 3.1.3)
+      bundler (~> 1.0)
+      railties (= 3.1.3)
+    rails-i18n-updater (1.0.1)
+      actionpack
+      activesupport
+      rails
+    railties (3.1.3)
+      actionpack (= 3.1.3)
+      activesupport (= 3.1.3)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.6)
+    rake (0.9.2.2)
+    rdoc (3.11)
+      json (~> 1.4)
+    rinku (1.4.1)
+    rmagick (2.13.1)
+    ruby-openid (2.1.8)
+    sanitize (2.0.3)
+      nokogiri (< 1.6, >= 1.4.4)
+    sass (3.1.10)
+    sass-rails (3.1.5)
+      actionpack (~> 3.1.0)
+      railties (~> 3.1.0)
+      sass (~> 3.1.10)
+      tilt (~> 1.3.2)
+    sprockets (2.0.3)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (!= 1.3.0, ~> 1.1)
+    therubyracer (0.9.9)
+      libv8 (~> 3.3.10)
+    thor (0.14.6)
+    tilt (1.3.3)
+    timecop (0.3.5)
+    treetop (1.4.10)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.31)
+    uglifier (1.1.0)
+      execjs (>= 0.3.0)
+      multi_json (>= 1.0.2)
+    validates_email_format_of (1.5.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  SystemTimer (>= 1.1.3)
+  coffee-rails (~> 3.1.0)
+  composite_primary_keys (>= 4.1.1)
+  dynamic_form
+  httpclient
+  jquery-rails
+  libxml-ruby (>= 2.0.5)
+  memcache-client
+  memcached
+  oauth-plugin (>= 0.4.0.pre7)
+  open_id_authentication (>= 1.1.0)
+  pg
+  rails (= 3.1.3)
+  rails-i18n-updater
+  rinku (>= 1.2.2)
+  rmagick
+  sanitize
+  sass-rails (~> 3.1.0)
+  therubyracer
+  timecop
+  uglifier
+  validates_email_format_of (>= 1.5.1)

Rakefile

@@ -1,10 +1,7 @@
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
-require(File.join(File.dirname(__FILE__), 'config', 'boot'))
-
+require File.expand_path('../config/application', __FILE__)
 require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
 
-require 'tasks/rails'
+OpenStreetMap::Application.load_tasks