Merge into master from pull request #76:

...n/java/net/floodlightcontroller/devicemanager/Device.java

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

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

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

...a/net/floodlightcontroller/topology/ITopologyService.java

...java/net/floodlightcontroller/topology/NodePortTuple.java

...a/net/floodlightcontroller/topology/TopologyInstance.java

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

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