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

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

src/main/python/PythonClient.pyc

src/main/python/PythonServer.pyc

src/main/python/compileall.pyc

src/main/python/debugserver.pyc

src/main/resources/web/index.html

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

src/main/resources/web/tpl/flow-list-item.html

src/main/resources/web/tpl/flow-list.html

src/main/resources/web/tpl/header.html

src/main/resources/web/tpl/home.html

src/main/resources/web/tpl/host-list-item.html

src/main/resources/web/tpl/host-list.html

src/main/resources/web/tpl/host.html

src/main/resources/web/tpl/port-list-item.html

src/main/resources/web/tpl/port-list.html

src/main/resources/web/tpl/status.html

src/main/resources/web/tpl/switch-list-item.html

src/main/resources/web/tpl/switch-list.html

src/main/resources/web/tpl/switch.html