corrected invalid merge
corrected invalid merge
cofflowstats => added field flags for OFP1.3
added uint16_t flags field to of1x_statistics
coxmatch.h => fixed bug => matches ARP_SPA/ARP_TPA/ARP_SHA/ARP_THA used invalid masked constants for OXM type
coxmatch.h => fixed bug => matches ARP_SPA/ARP_TPA/ARP_SHA/ARP_THA used invalid masked constants for OXM type
Merge branch 'devel-0.4' into devel-0.5

Conflicts:
	src/rofl/common/openflow/coxmatch.h
coxmatch.h => fixed bug => match ARP_THA used invalid constants for OXM type
Merge branch 'devel-0.4' into devel-0.5
of1x_match => __of1x_dump_matches() => fixed bug => IPV6_FLABEL is a 20bit value, stored within 32 bits, not 64bit
Merge branch 'devel-0.4' into devel-0.5
Merge branch 'akoepsel/devel-0.5/working' into akoepsel/devel-0.5/testing