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/DebugCounterGetResource.java
	floodlight/src/main/java/net/floodlightcontroller/debugcounter/DebugCounterResetResource.java
	floodlight/src/main/java/net/floodlightcontroller/debugcounter/DebugCounterStateResource.java

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

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

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

@@ -17,6 +17,7 @@ import org.slf4j.LoggerFactory;
  * @author Saurav
  */
 public class DebugCounterStateResource extends DebugCounterResourceBase {
+
     protected static Logger logger =
             LoggerFactory.getLogger(DebugCounterStateResource.class);