Create NullCounterStore and NullPktInProcessingTime modules. These are used to create a minimal configuration for performance testing or to turn them off.
Merge into master from pull request #33:
stats for broadcast and multicast pktIns (https://github.com/floodlight/floodlight/pull/33)
Merge branch 'master' of github.com:floodlight/floodlight

Conflicts:
	src/main/java/net/floodlightcontroller/forwarding/Forwarding.java
	src/main/java/net/floodlightcontroller/routing/ForwardingBase.java
	src/test/java/net/floodlightcontroller/staticflowentry/StaticFlowEntryPusherTest.java
Make static flow entry pusher test time a little higher for it to pass more consistently.
Merge into master from pull request #34:
Create NullCounterStore and NullPktInProcessingTime modules. (https://github.com/floodlight/floodlight/pull/34)
Delete methods in IRoutingInterface that refer to switch objects.  [It is also not  used anywhere in the code as of now.]
Splitting the TopologyService and TopologyListener into Topology and LinkDiscovery pieces.
Updating the add<Listener>Aware and remove<Listener>Aware methods for Link Discovery and Topology.
Change the compound key separator for these primary keys to '|'
Handle host move learning
Merge branch 'master' of github.com:floodlight/floodlight

Conflicts:
	src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java
	src/main/java/net/floodlightcontroller/topology/ITopologyService.java
	src/test/java/net/floodlightcontroller/forwarding/ForwardingTest.java
Only measure the start and end time of an OFMessage if the processing time service is enabled.
Merge into master from pull request #35:
Only measure the start and end time of an OFMessage if the processing… (https://github.com/floodlight/floodlight/pull/35)
Eliminating SwitchClusterId in IOFSwitch interface.
Added REST support for querying loaded modules

Available under /wm/core/module/list/json
Merge pull request #36 from capveg/master

Added REST support for querying loaded modules
Improved Module Loader REST interface

Now can show only loaded modules and links dependencies
Merge pull request #32 from lalithsuresh/patch

Fix restPort hard coding
added missing file to unbreak build
Merge into master from pull request #37:
    Improved Module Loader REST interface (https://github.com/floodlight/floodlight/pull/37)