Merge with the master floodlight

build.xml

lib/netty-3.10.0.Final.jar

lib/netty-all-4.0.31.Final.jar

lib/openflowj-2.0.0-SNAPSHOT-javadoc.jar

lib/openflowj-2.0.0-SNAPSHOT-sources.jar

lib/openflowj-2.0.0-SNAPSHOT.jar

logback.xml

pom.xml

...floodlightcontroller/core/IFloodlightProviderService.java

...ain/java/net/floodlightcontroller/core/IOFConnection.java

.../java/net/floodlightcontroller/core/IOFMessageWriter.java

src/main/java/net/floodlightcontroller/core/IOFSwitch.java

...main/java/net/floodlightcontroller/core/OFConnection.java

...va/net/floodlightcontroller/core/internal/Controller.java

...loodlightcontroller/core/internal/ControllerCounters.java

...ightcontroller/core/internal/HandshakeTimeoutHandler.java

...htcontroller/core/internal/NaiveSwitchDriverRegistry.java

...et/floodlightcontroller/core/internal/NullConnection.java

.../floodlightcontroller/core/internal/OFChannelHandler.java

...net/floodlightcontroller/core/internal/OFChannelInfo.java