Use Java 7.
1.7 language level.
Merge branch 'master' into vertx

Conflicts:
	idea/idea.gradle