Conflicts:
	openair1/PHY/CODING/ldpc_encoder.c
	openair1/PHY/LTE_TRANSPORT/dlsch_coding.c

Conflicts:
	openair1/PHY/LTE_TRANSPORT/dlsch_coding.c

Conflicts:
	openair1/PHY/CODING/ldpc_encoder.c

Conflicts:
	cmake_targets/CMakeLists.txt
	openair1/PHY/CODING/TESTBENCH/ldpctest.c
	openair1/PHY/CODING/defs.h
	openair1/PHY/CODING/ldpc_generate_coefficient.c

Conflicts:
	openair1/PHY/CODING/TESTBENCH/ldpctest.c
	openair1/PHY/CODING/defs.h
	openair1/PHY/LTE_TRANSPORT/dlsch_coding.c

Merge branch 'oai_ue_mwc18_integration' of https://gitlab.eurecom.fr/oai-nr/openairinterface5g into oai_ue_mwc18_integration

ldpc_encoder now supports again BG1 and BG2 where the original non-optimized algorithm is used for BG1

Conflicts:
	openair1/PHY/CODING/ldpc_encoder.c
	openair1/PHY/CODING/ldpc_generate_coefficient.c