merged master of cit-server.cit.tu-berlin.de:stratosphere.git into ozone distribution
(builds with maven, but untested)