resolve conflict when merge develop

openair1/PHY/INIT/lte_init.c

openair1/PHY/LTE_REFSIG/defs.h

openair1/PHY/LTE_REFSIG/lte_dl_ue_spec.c

openair1/PHY/LTE_REFSIG/lte_dl_uespec.c

openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c

openair1/PHY/LTE_TRANSPORT/pilots_ue_spec.c

openair1/PHY/LTE_TRANSPORT/proto.h

openair1/PHY/MODULATION/ofdm_mod.c

openair1/SIMULATION/LTE_PHY/dlsim.c