Minor documentation fix

Signed-off-by: Pierre DAL-PRA <dalpra.pierre@gmail.com>
Add support for websockets subprotocols
Add support for continuation frames on WebSockets

Signed-off-by: John Oliver <johno@insightfullogic.com>
Upgraded language module deps
Fix HttpResolution to follow entire location header uri (including query).

Signed-off-by: nscavell <nick.scavelli@gmail.com>
Add dynjs as an experimental language module.
Override getResource() in ModJSONClassLoader to behave the same as getResources()

Signed-off-by: Adrian Gonzalez <adrian.gonzalez@ef.com>
Merge pull request #812 from lance/master

Add dynjs as an experimental language module.
Merge pull request #806 from eclipse/websockets_subprotocol

Add support for websockets subprotocols
Merge pull request #809 from englishtown/feature/modjsonclassloader

Override getResource() in ModJSONClassLoader to behave the same as getResources()
Merge pull request #811 from nscavell/httpresolution

Fix HttpResolution to follow entire location header uri
Merge pull request #794 from pdalpra/docfix

Minor documentation fix
Merge branch 'master' of https://github.com/eclipse/vert.x into websocket-continuation-fix

Conflicts:
	vertx-testsuite/src/test/java/vertx/tests/core/websockets/WebsocketsTestClient.java
Merge pull request #808 from johnoliver/websocket-continuation-fix

Add support for Websocket continuations
corrected jython lang mod version
fixed modSuffix ternary expression so it appends -mod when true

Signed-off-by: David Dossot <david@dossot.net>
Merge pull request #815 from ddossot/bug-433054

fixed modSuffix ternary expression so it appends -mod when true
Make ClusterManager getMap and getMultiMap truely non-blocking.

Signed-off-by: nscavell <nick.scavelli@gmail.com>
Initial support for clustered shared data

Signed-off-by: nscavell <nick.scavelli@gmail.com>