Merge remote-tracking branch 'origin/master'

@@ -5,6 +5,7 @@ import java.io.IOException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+//FIXME: Should be move out to test or app
 /**
  * Message handler that echos the message back to the sender.
  */

@@ -6,6 +6,7 @@ import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.HashMap;
 
+//FIXME: Should be move out to test or app
 /**
  * Kryo Serializer.
  */

@@ -8,6 +8,7 @@ import org.onlab.metrics.MetricsManager;
 
 import com.codahale.metrics.Timer;
 
+// FIXME: Should be move out to test or app
 public final class SimpleClient {
     private SimpleClient() {
     }

 package org.onlab.netty;
 
+//FIXME: Should be move out to test or app
 public final class SimpleServer {
     private SimpleServer() {}