Merge branch 'master' of https://github.com/rizard/floodlight

...lightcontroller/core/web/AllSwitchStatisticsResource.java

...va/net/floodlightcontroller/core/web/CoreWebRoutable.java

...in/java/net/floodlightcontroller/core/web/StatsReply.java

...t/floodlightcontroller/core/web/StatsReplySerializer.java

...a/net/floodlightcontroller/core/web/StatsReplyToJson.java

...net/floodlightcontroller/core/web/SwitchResourceBase.java

...oodlightcontroller/core/web/SwitchStatisticsResource.java

...ntroller/core/web/serializers/ByteArrayMACSerializer.java

...dlightcontroller/core/web/serializers/DPIDSerializer.java

...dlightcontroller/core/web/serializers/IPv4Serializer.java

...odlightcontroller/core/web/serializers/MACSerializer.java

...controller/core/web/serializers/StatsReplySerializer.java

...t/floodlightcontroller/devicemanager/internal/Entity.java

src/main/java/net/floodlightcontroller/util/MatchUtils.java

src/main/resources/floodlightdefault.properties