updated javadoc
Merge branch 'master' of github.com:vert-x/vert.x