struggling
Merge branch 'master' of https://github.com/Dikton/heroku-buildpack-vertx-jdk7

Conflicts:
	bin/compile