Conflicts:
	src/main/java/net/floodlightcontroller/core/web/SwitchStatisticsResource.java

Openlow 1.3#serializer

method retrieve on SwitchStatisticsResource.java
2. Adding a custom serializer to serilize the StatsReply.
3. It only supports statistic_flow type and OF1.3 format now.

Fixed lots of compile errors in unit tests; mostly involved replacing longs with DatapathIds, byte[]s with MacAddresses and Ipv4Addresses, and shorts with OFPorts and VlanVids; some refactoring of flow mod contruction was also done to align with loxi's builders. The static flow puser now supports IP TOS for OF1.0 and for OF1.1+ it supports match/rewrite to either ECN or DSCP bits.

Static Flow Pusher supports all OF1.3 matches and most OF1.3 actions (with the exception of masks). LoadBalancer corrected; OFFlowAdd used instead of OFFlowModify and OFPort.ZERO correct to OFPort.ANY. ActionUtils, MatchUtils, and InstructionUtils added to support static flow pusher. Strings defining flow fields *standardized* for Floodlight in the new utils classes. This means the REST API for the SFP will expect a sligthly different syntax than the current REST API (for master and 0.90). We can change the field names easily though in the utils files. These names are also referenced for the keys the SFP uses to store flow match fields and actions, just to be consistent.

Fixed LLDP handling, DPID and OFPort serializers, accounted for default cluster ID = 0, modify circuitpusher.py for new REST API format.

2. Use the string to present the vlan value instead of hexidecimal.
3. Fix the id in Cluster.
4. Fix the serialize method of OFPort.

revert the modification of TopologyInstance, it will cause some problem of route, still need to understand

topologyInstance.

Fixed build.xml. Fixed/implemented workaround for remaining debug counter compile errors to allow compilation with ant. Static Flow Pusher now matches on all OF1.3 match fields; all OF1.3 actions/set-field are in progress now, but basic out-port action works.

Quick fix for OF1.0. Should find a way so that all modules don't have to worry about how to get Match from PI. OF1.0-1.2 use pi.getInPort(); OF1.3 uses pi.getMatch(MatchField.IN_PORT). Workaroud is: (pi.getVersion().compareTo(OFVersion.OF_13) < 0 ? pi.getInPort() : pi.getMatch().get(MatchField.IN_PORT))

Quick fix for OF1.0. Should find a way so that all modules don't have to worry about how to get Match from PI. OF1.0-1.2 use pi.getInPort(); OF1.3 uses pi.getMatch(MatchField.IN_PORT). Workaroud is: (pi.getVersion().compareTo(OFVersion.OF_13) < 0 ? pi.getInPort() : pi.getMatch().get(MatchField.IN_PORT))

VLAN matches added conditionally to Forwarding flows. Started moving sync code to the OFSwitchManager; not sure if SyncService needs to live there too.

Ethernet's untagged VLAN notation updated. Match.Builders created from exising Matches will only remember parent Match's MatchFields if the new builder is not modified (not very useful IMHO). MatchUtils.java added to create a new builder from and existing Match and retain all the MatchFields unless explictly overwritten with the new builder.

Forwarding with port, L2, and, L3 matches. OFPBMC_BAD_VALUE sent back from switch for matching FL's no-VLAN notation; need to update all VLAN's = -1 to NO_VLAN instead.

Ethernet fixed; proto = byte, not short. Fixed DeviceManager; toString() of Entity corrected and misc bugs. Fixed Forwarding; forgot to initialize OFSwitchService reference. Basic Forwarding works! Known issue: Forwarding only matches switch port numbers...

Forgot to update overridden equals() for many classes in devicemanager package. Devices are now compared correctly and are learned and not added repeatedly.

Working on device manager. Currently devices aren't being saved, or cannot be located after they are stored...I'm searching incorrectly for devices and entities or am not saving them correctly or at all.

Removed BSN-specific handshakes, some debug messages, tweaked static flow entry pusher, and hub to work with new OpenFlowJ-Loxi flow mod commands.

Initial OF1.3 handshake working. Still trouble write()ing to OFSwitch instance after handshake complete. The Connection is reported as down, yet the switch is echoed repeatedly w/o a problem...