Merge into master from pull request #136:

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

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

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

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

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

...ava/net/floodlightcontroller/routing/IRoutingService.java

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

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

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

...lightcontroller/topology/web/BroadcastDomainResource.java

...dlightcontroller/topology/web/SwitchClustersResource.java

...loodlightcontroller/topology/web/TunnelLinksResource.java

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

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

...t/floodlightcontroller/topology/TopologyInstanceTest.java

...et/floodlightcontroller/topology/TopologyManagerTest.java