Merge pull request #551 from rizard/master

build.xml

...tcontroller/devicemanager/internal/DeviceManagerImpl.java

...a/net/floodlightcontroller/loadbalancer/LoadBalancer.java

src/main/java/net/floodlightcontroller/packet/ARP.java

src/main/java/net/floodlightcontroller/packet/Ethernet.java

.../java/net/floodlightcontroller/testmodule/TestModule.java

.../java/net/floodlightcontroller/core/OFSwitchBaseTest.java

...et/floodlightcontroller/core/internal/ControllerTest.java

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

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

...troller/devicemanager/internal/DeviceManagerImplTest.java

.../java/net/floodlightcontroller/firewall/FirewallTest.java

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

...test/java/net/floodlightcontroller/packet/PacketTest.java