Merge into master from pull request #101:

...ler/core/web/serializers/NodePortTupleJSONSerializer.java

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

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

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

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

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

...loodlightcontroller/topology/web/TopologyWebRoutable.java

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

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