Merge into master from pull request #25:

speed up staticflowpusher unittests (https://github.com/floodlight/floodlight/pull/25)

src/test/java/net/floodlightcontroller/staticflowentry/StaticFlowEntryPusherTest.java

@@ -67,6 +67,7 @@ public class StaticFlowEntryPusherTest extends FloodlightTestCase {
         switchMap.put(dpid, mockSwitch);
         mockFloodlightProvider.setSwitches(switchMap);
         staticFlowEntryPusher.setFloodlightProvider(mockFloodlightProvider);
+        staticFlowEntryPusher.setFlowPushTimeSeconds(2); // speed up push timer for faster testing
         long timeSfpStart = System.currentTimeMillis();
         staticFlowEntryPusher.startUp();