Merge branch 'master' of github.com:floodlight/floodlight

...net/floodlightcontroller/core/OFMessageFilterManager.java

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

.../net/floodlightcontroller/core/internal/OFSwitchImpl.java

...dlightcontroller/core/web/ControllerSwitchesResource.java

...ntroller/core/web/serializers/ByteArrayMACSerializer.java

...ightcontroller/core/web/serializers/UShortSerializer.java

...et/floodlightcontroller/devicemanager/IDeviceService.java

...odlightcontroller/devicemanager/IEntityClassListener.java

...ghtcontroller/devicemanager/IEntityClassifierService.java

...oller/devicemanager/internal/DefaultEntityClassifier.java

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

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

...java/net/floodlightcontroller/topology/NodePortTuple.java

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