Merge pull request #658 from rizard/master

.travis.yml

build.xml

lib/easymock-3.4.jar

lib/junit-4.12.jar

lib/junit-4.8.2.jar

lib/org.easymock-3.1.jar

pom.xml

.../java/net/floodlightcontroller/forwarding/Forwarding.java

src/main/java/net/floodlightcontroller/util/MatchUtils.java

...htcontroller/core/internal/OFChannelHandlerVer10Test.java

...htcontroller/core/internal/OFChannelHandlerVer13Test.java

.../floodlightcontroller/core/internal/OFConnectionTest.java

.../floodlightcontroller/core/internal/OFSwitchBaseTest.java

...a/net/floodlightcontroller/forwarding/ForwardingTest.java

src/test/java/net/floodlightcontroller/hub/HubTest.java

...oodlightcontroller/learningswitch/LearningSwitchTest.java

...ller/linkdiscovery/internal/LinkDiscoveryManagerTest.java

...t/floodlightcontroller/loadbalancer/LoadBalancerTest.java

...floodlightcontroller/staticflowentry/StaticFlowTests.java