vertx integration
Merge branch 'master' of https://github.com/micoli/ccphoneUI.git

Conflicts:
	pom.xml