Preparing Apache Derby
Merge branch 'master' of https://github.com/emrehasan/stratosphere

Conflicts:
	pact/pact-common/src/main/java/eu/stratosphere/pact/common/io/JDBCInputFormat.java
	pact/pact-common/src/test/java/eu/stratosphere/pact/common/io/JDBCInputFormatTest.java
Resolved merging-conflicts