Merge branch 'master' of code.hpi.uni-potsdam.de:ping

Conflicts:
	java/ping/src/ping/Scheduler.java