The list of scopes now RFC6749 Sec.3.3 compliant

See http://tools.ietf.org/html/rfc6749#section-3.3 for details.

The callback url is now determined correctly if the swagger index.html file and
therefore the o2c.html is not in root directory of the host.

Also the popup opens more than one authorization-request-tab in firefox
(seems to append the on-click js method instead of replacing it)
Merge pull request #435 from JoergAdler/master

The list of scopes now RFC6749 Sec.3.3 compliant
Merge remote-tracking branch 'upstream/master'
updated to support explicit keys
Update underscore-min.js
Fix handling for jQuery response headers

Fixes the way response headers are parsed when using the jQuery client. Enables the response headers to be properly viewed in the UI. Previous logic consistently returned an empty set of headers. Includes minor changes to allow the use of JS strict mode, at least for this function.
Merge pull request #478 from tillig/patch-1

Fix handling for jQuery response headers
Merge pull request #477 from paladox2015/patch-3

Update underscore-min.js
Fix handling for jQuery response headers

Fixes the way response headers are parsed when using the jQuery client. Enables the response headers to be properly viewed in the UI. Previous logic consistently returned an empty set of headers. Includes minor changes to allow the use of JS strict mode, at least for this function.
Merge pull request #479 from tillig/patch-2

Fix handling for jQuery response headers
Merge branch 'master' of github.com:wordnik/swagger-ui
fixed #340 with empty body, updated swagger-js
updated versions, swagger-js
switched to snippet view #491
Fix for issue #492; HTML in response headers

Fix for issue #492 by escaping the response headers using Underscore
Merge pull request #493 from vanderlee/patch-1

Fix for issue #492; HTML in response headers
updated distro to include #493
fixed undefined variable errors
Merge pull request #500 from 3scale/patch-2

Fixed undefined variable error
Merge remote-tracking branch 'upstream/master'

Conflicts:
	dist/index.html
	dist/lib/swagger-oauth.js
	dist/lib/swagger.js
	dist/swagger-ui.js
	dist/swagger-ui.min.js
	src/main/html/index.html