remove java.nio from TestDataUtilTest
added some comment
solve conflict
comments on examples
javadoc for DataStream
Merge branch 'intern' of https://github.com/stratosphere/stratosphere-streaming into intern
Merge branch 'intern'
merge