Merge into master from pull request #34:

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

...odlightcontroller/core/module/FloodlightModuleLoader.java

...t/floodlightcontroller/core/module/IFloodlightModule.java

.../floodlightcontroller/core/module/IFloodlightService.java

...n/java/net/floodlightcontroller/counter/CounterStore.java

...va/net/floodlightcontroller/counter/NullCounterStore.java

...t/floodlightcontroller/perfmon/CircularTimeBucketSet.java

...dlightcontroller/perfmon/IPktInProcessingTimeService.java

...floodlightcontroller/perfmon/NullPktInProcessingTime.java

...java/net/floodlightcontroller/perfmon/PerfMonConfigs.java

...net/floodlightcontroller/perfmon/PktInProcessingTime.java

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

src/main/resources/floodlightdefault.properties

...controller/staticflowentry/StaticFlowEntryPusherTest.java