Merge into master from pull request #252:

build.xml

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

...in/java/net/floodlightcontroller/counter/CountSeries.java

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

...t/floodlightcontroller/learningswitch/LearningSwitch.java

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

...java/net/floodlightcontroller/routing/ForwardingBase.java

...ightcontroller/staticflowentry/StaticFlowEntryPusher.java

...va/net/floodlightcontroller/topology/TopologyManager.java

...dlightcontroller/virtualnetwork/VirtualNetworkFilter.java

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

src/main/resources/floodlightdefault.properties

...ghtcontroller/core/module/FloodlightTestModuleLoader.java

...loodlightcontroller/core/test/MockFloodlightProvider.java

...a/net/floodlightcontroller/forwarding/ForwardingTest.java

...oodlightcontroller/learningswitch/LearningSwitchTest.java

...ava/net/floodlightcontroller/test/FloodlightTestCase.java