commit before pull
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 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.