Beautifying :-)
Even more beautifying :-)

Merge branch 'master' of https://github.com/D-iii-S/java-ubench-agent

Conflicts:
	src/c/benchmark.c
	src/c/events.c
	src/c/measure.c