Merge pull request #602 from rxin/shufflemerge

core/src/main/java/spark/network/netty/FileClient.java

...ava/spark/network/netty/FileClientChannelInitializer.java

.../src/main/java/spark/network/netty/FileClientHandler.java

core/src/main/java/spark/network/netty/FileServer.java

...ava/spark/network/netty/FileServerChannelInitializer.java

.../src/main/java/spark/network/netty/FileServerHandler.java

core/src/main/java/spark/network/netty/PathResolver.java

core/src/main/scala/spark/network/BufferMessage.scala

core/src/main/scala/spark/network/Connection.scala

core/src/main/scala/spark/network/ConnectionManager.scala

core/src/main/scala/spark/network/ConnectionManagerId.scala

core/src/main/scala/spark/network/Message.scala

core/src/main/scala/spark/network/MessageChunk.scala

core/src/main/scala/spark/network/MessageChunkHeader.scala

core/src/main/scala/spark/network/netty/FileHeader.scala

core/src/main/scala/spark/network/netty/ShuffleCopier.scala

core/src/main/scala/spark/network/netty/ShuffleSender.scala

core/src/main/scala/spark/storage/BlockFetchTracker.scala

core/src/main/scala/spark/storage/BlockFetcherIterator.scala

core/src/main/scala/spark/storage/BlockManager.scala