Conflicts:
	meteor/meteor-client/bin/pom.xml
	meteor/meteor-meteor/bin/pom.xml
	meteor/meteor-meteor/pom.xml
	meteor/meteor-meteor/src/main/java/eu/stratosphere/meteor/MeteorLexer.java
	meteor/meteor-meteor/src/main/java/eu/stratosphere/meteor/MeteorParser.java
	pom.xml
	sopremo/sopremo-base/bin/pom.xml
	sopremo/sopremo-base/src/test/java/eu/stratosphere/sopremo/base/GlobalEnumerationTest.java
	sopremo/sopremo-client/bin/pom.xml
	sopremo/sopremo-common/bin/pom.xml
	sopremo/sopremo-common/src/main/java/eu/stratosphere/sopremo/AbstractSopremoType.java
	sopremo/sopremo-common/src/main/java/eu/stratosphere/sopremo/pact/SopremoUtil.java
	sopremo/sopremo-common/src/main/java/eu/stratosphere/sopremo/serialization/AbstractSchema.java
	sopremo/sopremo-common/src/main/java/eu/stratosphere/sopremo/serialization/DataInputToInputStreamAdapter.java
	sopremo/sopremo-common/src/main/java/eu/stratosphere/sopremo/serialization/GeneralSchema.java
	sopremo/sopremo-common/src/main/java/eu/stratosphere/sopremo/type/ObjectNode.java
	sopremo/sopremo-common/src/main/java/eu/stratosphere/sopremo/type/TextNode.java
	sopremo/sopremo-common/src/test/java/eu/stratosphere/sopremo/io/OutputFormatTest.java
	sopremo/sopremo-common/src/test/java/eu/stratosphere/sopremo/pact/JsonNodeWrapperTest.java
	sopremo/sopremo-common/src/test/java/eu/stratosphere/sopremo/serialization/HeadArraySchemaTest.java
	sopremo/sopremo-common/src/test/java/eu/stratosphere/sopremo/serialization/TailArraySchemaTest.java
	sopremo/sopremo-common/src/test/java/eu/stratosphere/sopremo/type/ArrayNodeBaseTest.java
	sopremo/sopremo-common/src/test/java/eu/stratosphere/sopremo/type/BigIntegerNodeTest.java
	sopremo/sopremo-common/src/test/java/eu/stratosphere/sopremo/type/ObjectNodeBaseTest.java
	sopremo/sopremo-query/bin/pom.xml
	sopremo/sopremo-server/bin/pom.xml
	stratosphere-dist/src/main/assemblies/bin.xml
	stratosphere-dist/src/main/stratosphere-bin/bin/meteor-webfrontend.sh

Change-Id: I9a76e622d8f17f8f75aa0a2092f18367eb0ab011