Merge branch 'master' of github.com:bigswitch/bigswitchcontroller

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

...loodlightcontroller/core/internal/FloodlightProvider.java

...a/net/floodlightcontroller/debugcounter/DebugCounter.java

...t/floodlightcontroller/debugcounter/NullDebugCounter.java

...ightcontroller/debugcounter/web/DebugCounterResource.java

...a/net/floodlightcontroller/debugevent/CircularBuffer.java

.../java/net/floodlightcontroller/debugevent/DebugEvent.java

src/main/java/net/floodlightcontroller/debugevent/Event.java

...t/floodlightcontroller/debugevent/IDebugEventService.java

...a/net/floodlightcontroller/debugevent/NullDebugEvent.java

...oodlightcontroller/debugevent/web/DebugEventResource.java

...ightcontroller/debugevent/web/DebugEventResourceBase.java

...oodlightcontroller/debugevent/web/DebugEventRoutable.java

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

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

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

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

src/main/resources/apps/simpleforwarding.json

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

...t/floodlightcontroller/debugevent/CircularBufferTest.java