Merge branch 'develop' into oai-iis-testbed-interop

cmake_targets/CMakeLists.txt

openair1/PHY/LTE_TRANSPORT/proto.h

openair1/SIMULATION/LTE_PHY/dlsim.c

openair1/SIMULATION/LTE_PHY/mbmssim.c

openair1/SIMULATION/LTE_PHY/pbchsim.c

openair1/SIMULATION/LTE_PHY/pdcchsim.c

openair1/SIMULATION/LTE_PHY/prachsim.c

openair1/SIMULATION/LTE_PHY/pucchsim.c

openair1/SIMULATION/LTE_PHY/ulsim.c

openair1/SIMULATION/TOOLS/abstraction.c

openair1/SIMULATION/TOOLS/defs.h

openair1/SIMULATION/TOOLS/multipath_tv_channel.c

openair1/SIMULATION/TOOLS/random_channel.c

...PROJECTS/GENERIC-LTE-EPC/CONF/enb.band38.tm1.exmimo2.conf

...PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf

...ets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.usrpb210.conf

targets/SIMU/USER/channel_sim.c

targets/SIMU/USER/oaisim_functions.c

targets/SIMU/USER/sinr_sim.c