Merge into master from pull request #141:

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

...ava/net/floodlightcontroller/core/IOFMessageListener.java

...va/net/floodlightcontroller/core/internal/Controller.java

...ontroller/core/web/serializers/OFMatchJSONSerializer.java

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

...t/floodlightcontroller/devicemanager/internal/Entity.java

...loodlightcontroller/flowcache/IFlowReconcileListener.java

.../net/floodlightcontroller/flowcache/OFMatchReconcile.java

.../java/net/floodlightcontroller/forwarding/Forwarding.java

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

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

src/main/java/org/openflow/protocol/OFMatch.java

src/main/java/org/openflow/protocol/OFMatchWithSwDpid.java

.../openflow/protocol/serializers/OFMatchJSONSerializer.java

...et/floodlightcontroller/core/internal/ControllerTest.java

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

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

...oodlightcontroller/learningswitch/LearningSwitchTest.java