Merge branch 'master' of github.com:floodlight/floodlight

build.xml

floodlight.sh

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

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

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

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

...in/java/net/floodlightcontroller/counter/CountSeries.java

...ghtcontroller/devicemanager/internal/AttachmentPoint.java

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

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

...t/floodlightcontroller/learningswitch/LearningSwitch.java

...et/floodlightcontroller/linkdiscovery/ILinkDiscovery.java

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

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

...ightcontroller/staticflowentry/StaticFlowEntryPusher.java

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

...dlightcontroller/virtualnetwork/VirtualNetworkFilter.java

...es/net.floodlightcontroller.core.module.IFloodlightModule

src/main/resources/floodlightdefault.properties

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