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

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

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

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

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

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

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

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

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

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

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

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

src/main/resources/web/index.html

src/main/resources/web/js/main.js

src/main/resources/web/js/models/flowmodel.js

src/main/resources/web/js/models/hostmodel.js

src/main/resources/web/js/models/statusmodel.js

src/main/resources/web/js/models/switchmodel.js

src/main/resources/web/js/models/topologymodel.js

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

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