Merge pull request #371 from kwanggithub/master

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

...et/floodlightcontroller/devicemanager/IDeviceService.java

...t/floodlightcontroller/devicemanager/internal/Device.java

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

...odlightcontroller/devicemanager/web/DeviceSerializer.java

...n/java/net/floodlightcontroller/flowcache/FCQueryObj.java

...dlightcontroller/linkdiscovery/ILinkDiscoveryService.java

...ntroller/linkdiscovery/internal/LinkDiscoveryManager.java

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

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

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

...java/net/floodlightcontroller/routing/ForwardingBase.java

...va/net/floodlightcontroller/topology/TopologyManager.java

...dlightcontroller/virtualnetwork/VirtualNetworkFilter.java

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

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

...troller/devicemanager/internal/DeviceUniqueIndexTest.java

...t/floodlightcontroller/devicemanager/test/MockDevice.java

...lightcontroller/devicemanager/test/MockDeviceManager.java

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