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