Updated grade properties
Updated grade wrapper
Updated vert classpath
Merge branch 'master' of https://github.com/WeaSeLworks/happiness

Conflicts:
	vertx_classpath.txt