Merge pull request #696 from burningTyger/master

README updates German/English
ignore defined but empty ENV['PORT']
Merge pull request #698 from noxqsgit/master

please ignore defined but empty ENV['PORT']
add jrub-20mode
Merge branch 'master' of github.com:sinatra/sinatra
Reindent some chunks of code
Merge pull request #699 from patriciomacadden/reindentation

Reindent some chunks of code
Add env["sinatra.route"] for simpler instrumentation
Merge pull request #702 from tmm1/expose-sinatra-route

Easier instrumentation via env['sinatra.route']
Use URI::Parser#unescape instead of URI::decode

URI::decode is deprecated as of Ruby 1.9.2.

See:

- https://github.com/ruby/ruby/commit/238b979f1789f95262a267d8df6239806f2859cc
- https://github.com/rails/rails/commit/76b2d3e33730fce9680d0b6e97df12b1744fb23d

The redefinition of URI to URI::Parser, when defined, was incorrectly
scoped, causing URI::decode not to explode when expected on Ruby
1.9.2+.

This patch switches over to using #unescape and fixes the constant
definition's scope.

It also gets rid of the following warning when running in verbose mode:

lib/sinatra/base.rb:972:in `block in process_route': warning: URI.unescape is obsolete
Merge pull request #701 from craiglittle/master

Use URI::Parser#unescape instead of URI::decode
Fix for NameError: uninitialized constant HelpersTest::JSON
Reorder Sinatra::Base.
Merge pull request #703 from viliampucik/master

Fix for NameError: uninitialized constant HelpersTest::JSON
Merge pull request #704 from patriciomacadden/reorder

Reorder Sinatra::Base's metaclass
Correct some typos
Merge pull request #707 from patriciomacadden/typo

Correct some typos
revert part of f069b53
revert more of f069b53
Only overwrite pass_block if there's a value

This prevents pass_block from being overwritten with nil which happens when the superclass has (non-matching) routes.

This bites in development as Sinatra::Base registers "get '/__sinatra__/:image.png'" only in development mode, so everything works fine in production but not in development.