commit before pull
Merge branch 'openflow-1.3', remote-tracking branch 'upstream/master' into openflow-1.3
1. Adding some serializers.
2. Use the serializer for some object.
3. Fix the bug in the buildRoute method on the ToplogInstance
1. Fix the error for /wm/core/controller/switches/json restapi.
2. Use the custom serializer for IOFSwitch.
Merge pull request #3 from hwchiu/openflow-1.3#3

Openflow 1.3#3
Merge branch 'master' of https://github.com/rizard/floodlight

Conflicts:
	src/main/java/net/floodlightcontroller/core/web/SwitchStatisticsResource.java
OFStatsReply custom serializer. Works for OFFlowStatsReply presently.
Merge pull request #4 from hwchiu/openflow-1.3#4

Openflow 1.3#4
Merge Hung-Wei's #3 pull request
Merge branch 'master' of https://github.com/rizard/floodlight
Incorporate Hung-Wei's and my stats reply and other REST API changes. A couple of bug fixes from Hung-Wei too.
Working on unit tests. Found bugs in TCP and UDP. ByteBuffer returns a (signed) short for ports, but they are valid 0-65535, not -32768-32767. Convert possibly negative ports from BB to positive ints using a bitmask.
Refactor IPv4 and UDP payload's protocol class map the proper way.
Load balancer quick fix due to prior IPv4 packet changes. Uses LOXI IpProtocol now to reference certain protocol numbers, not IPv4 anymore.
Merge pull request #458 from rizard/master

Improvements/Fixes to REST API