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

Conflicts:
	floodlight/src/main/java/net/floodlightcontroller/debugcounter/DebugCounter.java
	floodlight/src/main/java/net/floodlightcontroller/debugcounter/IDebugCounterService.java

src/main/java/net/floodlightcontroller/debugcounter/DebugCounter.java

@@ -374,6 +374,4 @@ public class DebugCounter implements IFloodlightModule, IDebugCounterService {
 
    }
 
-
-
 }