Merge into master from pull request #14:

...t/floodlightcontroller/core/internal/CmdLineSettings.java

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

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

...tcontroller/core/web/serializers/LinkTupleSerializer.java

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

...ightcontroller/staticflowentry/StaticFlowEntryPusher.java

.../floodlightcontroller/topology/internal/TopologyImpl.java

.../net/floodlightcontroller/topology/web/LinksResource.java

...oodlightcontroller/topology/web/TopologyWebRouteable.java