Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/main/java/org/vertx/java/deploy/impl/VerticleManager.java
	src/main/java/org/vertx/java/deploy/impl/java/JavaVerticleFactory.java
Plug compiling class loader into new JavaVerticleFactory
Dynamic loading of .java files
remove type
added ignoring files related with IntelliJ iDEA to .gitignore
added Eclipse and IntelliJ gradle plugin for IDE
mainly added some tracing in the sockjs stuff
Merge branch 'master' of github.com:purplefox/vert.x
Revert "Merge pull request #133 from nelsonsilva/commonjs"

This reverts commit 96506dc80efb4943b9556fe156a5991022581608, reversing
changes made to 16473dbd48c507e2ac35534921fe6f479fe3fdd8.
Merge branch 'master' of github.com:purplefox/vert.x
removed unused file
Merge pull request #140 from keesun/master

added ignoring files related with IntelliJ iDEA to .gitignore
Add authentication of DB if username and password provided in config
don't hardcode host/port etc in webapp example
Merge branch 'master' of github.com:purplefox/vert.x
Merge pull request #122 from pidster/JMX_02

Initial JMX support
Merge branch 'master' of github.com:purplefox/vert.x
Revert "Merge pull request #122 from pidster/JMX_02"

This reverts commit 2c7230c3b7efdd057d0b197661776adcaf6c0fa6, reversing
changes made to 3b81a8fe6ba3714dbe1d489e7502748084259711.
Merge branch 'master' of https://github.com/jannehietamaki/vert.x
A few tweaks to compiling Java verticle pull request