Merge pull request #683 from rizard/yens

...et/floodlightcontroller/core/types/JsonObjectWrapper.java

...va/net/floodlightcontroller/core/types/NodePortTuple.java

...in/java/net/floodlightcontroller/core/types/PathNode.java

...ler/core/web/serializers/JsonObjectWrapperSerializer.java

...troller/core/web/serializers/NodePortTupleSerializer.java

...t/floodlightcontroller/devicemanager/internal/Device.java

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

...loodlightcontroller/flowcache/PortDownReconciliation.java

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

...dlightcontroller/linkdiscovery/ILinkDiscoveryService.java

...ain/java/net/floodlightcontroller/linkdiscovery/Link.java

...ntroller/linkdiscovery/internal/LinkDiscoveryManager.java

...htcontroller/linkdiscovery/web/DirectedLinksResource.java

...htcontroller/linkdiscovery/web/ExternalLinksResource.java

.../floodlightcontroller/linkdiscovery/web/LinkWithType.java

...floodlightcontroller/linkdiscovery/web/LinksResource.java

...a/net/floodlightcontroller/loadbalancer/LoadBalancer.java

.../java/net/floodlightcontroller/routing/BroadcastTree.java

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

...ava/net/floodlightcontroller/routing/IRoutingService.java