Merge pull request #331 from alexreimers/master

src/main/java/net/floodlightcontroller/core/IOFSwitch.java

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

.../net/floodlightcontroller/core/internal/OFSwitchImpl.java

...net/floodlightcontroller/core/web/SwitchResourceBase.java

...n/java/net/floodlightcontroller/counter/CounterStore.java

src/main/java/net/floodlightcontroller/counter/ICounter.java

...et/floodlightcontroller/counter/ICounterStoreService.java

...va/net/floodlightcontroller/counter/NullCounterStore.java

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

...lightcontroller/linkdiscovery/ILinkDiscoveryListener.java

...dlightcontroller/linkdiscovery/ILinkDiscoveryService.java

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

...htcontroller/linkdiscovery/web/ExternalLinksResource.java

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

src/main/java/net/floodlightcontroller/packet/Data.java

src/main/java/net/floodlightcontroller/packet/IPv4.java

src/main/java/net/floodlightcontroller/packet/TCP.java

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

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

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