Conflicts:
	meteor/meteor-meteor/pom.xml
	sopremo/sopremo-base/src/test/java/eu/stratosphere/sopremo/base/GlobalEnumerationTest.java
	sopremo/sopremo-client/pom.xml
	sopremo/sopremo-common/pom.xml
	sopremo/sopremo-common/src/test/java/eu/stratosphere/sopremo/type/BigIntegerNodeTest.java
	stratosphere-dist/pom.xml

Signed-off-by: physikerwelt (Moritz Schubotz) <wiki@physikerwelt.de>

Change-Id: I3b06ddc4f68b5f278c70da2fafce037e9b55fe5f