commit before merge

cmake_targets/CMakeLists.txt

openair1/PHY/defs.h

openair1/PHY/extern.h

openair1/PHY/vars.h

openair1/SCHED/phy_procedures_lte_eNb.c

openair2/UTIL/OCG/OCG.h

...C-LTE-EPC/CONF/enb.band7.generic.oaisim.local_no_mme.conf

targets/RT/USER/lte-enb.c

targets/RT/USER/lte-softmodem.c

targets/RT/USER/lte-ue.c

targets/SIMU/USER/oaisim.c

targets/SIMU/USER/oaisim_functions.c