Merge remote-tracking branch 'floodlight/master' into addrspace

src/main/images/Floodlight Icons.sketch/Data

...main/images/Floodlight Icons.sketch/QuickLook/Preview.png

...in/images/Floodlight Icons.sketch/QuickLook/Thumbnail.png

src/main/images/README

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

...odlightcontroller/core/module/FloodlightModuleLoader.java

...tcontroller/core/web/serializers/LinkTupleSerializer.java

...java/net/floodlightcontroller/linkdiscovery/LinkInfo.java

...ava/net/floodlightcontroller/linkdiscovery/LinkTuple.java

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

...floodlightcontroller/linkdiscovery/web/LinksResource.java

...roller/staticflowentry/IStaticFlowEntryPusherService.java

...oodlightcontroller/staticflowentry/StaticFlowEntries.java

src/main/java/org/openflow/protocol/OFMatch.java

...ain/java/org/openflow/protocol/action/OFActionOutput.java

src/main/resources/web/img/server.png

src/main/resources/web/img/switch.png

src/main/resources/web/js/views/topology.js