Merge into master from pull request #116:

...floodlightcontroller/core/IFloodlightProviderService.java

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

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

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

...ightcontroller/staticflowentry/StaticFlowEntryPusher.java

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

...et/floodlightcontroller/core/internal/ControllerTest.java

...loodlightcontroller/core/test/MockFloodlightProvider.java