Merge remote-tracking branches 'upstream/master' and 'origin/openflow-1.3' into openflow-1.3
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.
Forgot to change floodlightdefault.properties; removed my TestModule and added back Forwarding.
1. Create new type StatsReply to encapsulate the return value of the
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.
Merge branch 'openflow-1.3', remote-tracking branch 'upstream/master' into openlow-1.3#Serializer
replace the tab with 4-space
Merge pull request #2 from hwchiu/openlow-1.3#Serializer

Openlow 1.3#serializer
Merge pull request #457 from rizard/master

Resolved some unit test compile errors; broke up TOS into ECN and DSCP bits for static flow pusher match/actions