Merge into master from pull request #118:

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

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

...va/net/floodlightcontroller/core/web/CoreWebRoutable.java

...troller/core/web/EventHistoryAttachmentPointResource.java

...ightcontroller/core/web/EventHistoryPacketInResource.java

...floodlightcontroller/core/web/JacksonCustomConverter.java

...dlightcontroller/core/web/serializers/DPIDSerializer.java

.../web/serializers/DeviceAttachmentPointJSONSerializer.java

...controller/core/web/serializers/DeviceJSONSerializer.java

...dlightcontroller/core/web/serializers/IPv4Serializer.java

...odlightcontroller/core/web/serializers/MACSerializer.java

...n/java/net/floodlightcontroller/devicemanager/Device.java

...dlightcontroller/devicemanager/DeviceAttachmentPoint.java

...odlightcontroller/devicemanager/DeviceNetworkAddress.java

.../java/net/floodlightcontroller/devicemanager/IDevice.java

...t/floodlightcontroller/devicemanager/IDeviceListener.java

...dlightcontroller/devicemanager/IDeviceManagerService.java

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

.../net/floodlightcontroller/devicemanager/IEntityClass.java

...floodlightcontroller/devicemanager/IEntityClassifier.java