Merge into master from pull request #63:

.gitignore

build.xml

...floodlightcontroller/packetstreamer/thrift/Constants.java

...t/floodlightcontroller/packetstreamer/thrift/Message.java

...dlightcontroller/packetstreamer/thrift/OFMessageType.java

...et/floodlightcontroller/packetstreamer/thrift/Packet.java

...lightcontroller/packetstreamer/thrift/PacketStreamer.java

...ightcontroller/packetstreamer/thrift/SwitchPortTuple.java

lib/libthrift-0.7.0.jar

setup.sh

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

.../web/serializers/DeviceAttachmentPointJSONSerializer.java

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

...e/web/serializers/DeviceNetworkAddressJSONSerializer.java

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

...ller/devicemanager/internal/DeviceManagerWebRoutable.java

...ightcontroller/devicemanager/internal/DeviceResource.java

...troller/devicemanager/internal/DeviceManagerImplTest.java