small corrections for java 7
Merge branch 'nextGenWin' of https://github.com/senorcarbone/incubator-flink into nextGenWin

Conflicts:
	flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/datastream/NextGenDataStream.java
	flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/nextgen/NextGenBasicExample.java
Merge branch 'nextGenWin' of https://github.com/senorcarbone/incubator-flink into nextGenWin