of1x_flow_table.c => adding actions POP_PBB and PUSH_PBB to bitmap of supported actions, adding instruction IT_METER to bitmap of supported instructions
Removing unnecessary parameter in pop_pbb. Adjusting tests
Merge branch 'akoepsel/devel-0.5/testing' into akoepsel/devel-0.5/pbb
Merge branch 'akoepsel/devel-0.5/pbb' of https://github.com/bisdn/rofl-core into akoepsel/devel-0.5/pbb
Merge branch 'devel-0.5' into akoepsel/devel-0.5/pbb
Merge branch 'akoepsel/devel-0.5/testing' into akoepsel/devel-0.5/pbb
Merge branch 'akoepsel/devel-0.5/testing' into akoepsel/devel-0.5/pbb
Merge branch 'akoepsel/devel-0.5/testing' into akoepsel/devel-0.5/pbb
of1x_instruction_pp.h => __of1x_process_instructions() => fixed swapped | and & for WRITE_METADATA instruction
Merge branch 'akoepsel/devel-0.5/testing' into akoepsel/devel-0.5/pbb

Conflicts:
	src/rofl/datapath/pipeline/openflow/openflow1x/pipeline/of1x_instruction_pp.h
corrected invalid merge
corrected invalid merge
Merge branch 'akoepsel/devel-0.5/testing' into akoepsel/devel-0.5/pbb
Merge branch 'devel-0.5' into akoepsel/devel-0.5/pbb
Merge branch 'devel-0.5' into akoepsel/devel-0.5/pbb
Merge branch 'devel-0.5' into akoepsel/devel-0.5/pbb
Merge branch 'devel-0.5' into akoepsel/devel-0.5/pbb
Merge branch 'devel-0.5' into akoepsel/devel-0.5/pbb
Merge branch 'devel-0.5' into akoepsel/devel-0.5/pbb
Merge branch 'devel-0.5' into akoepsel/devel-0.5/pbb