Conflicts:
	targets/RT/USER/lte-ru.c
	targets/RT/USER/lte-softmodem.h

minor modifications to lte-ru.c and ru_control.c.  Addition of lte_noS1_buildCMakelists.template which somehow got removed.

Conflicts:
	cmake_targets/build_oai
	openair1/PHY/LTE_TRANSPORT/prach.c
	openair1/PHY/LTE_TRANSPORT/pucch.c
	openair1/PHY/LTE_UE_TRANSPORT/initial_sync.c
	openair1/SCHED/fapi_l1.c
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair2/LAYER2/MAC/eNB_scheduler.c
	openair2/LAYER2/MAC/eNB_scheduler_RA.c
	openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
	openair2/LAYER2/MAC/eNB_scheduler_primitives.c
	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
	targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
	targets/RT/USER/lte-enb.c
	targets/RT/USER/lte-ru.c
	targets/RT/USER/lte-softmodem.h

Summary of changes:
- bug fixes in various places

A better solution has to be found.

Pass the command line arguemnt -vcd to trace all VCD variables
and functions.

 -- balanced (current version): all UE shares the same BW
 -- single-ue : one UE will use the whole requested BW
 -- unbalanced : all but one UE will use a residual 2% of the requested BW
                 the rest of requested BW will be used by one UE
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

One of the optimized RE allocation function does not work properly
and generates some decoding errors with a COTS UE. Let's use the
generic function for the moment, while analyzing what is wrong.

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

Merge remote-tracking branch 'origin/338-correcting-changes-made-in-dlsch_demodulation-c-in-8cbe7cf6' into develop_integration_2018_w31

Conflicts:
	openair1/PHY/LTE_UE_TRANSPORT/dlsch_demodulation.c

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

Merge remote-tracking branch 'origin/337-fix-t_ids-h-issue-for-phy_mex' into develop_integration_2018_w31

Conflicts:
	cmake_targets/CMakeLists.txt

Merge remote-tracking branch 'origin/issue332-dft-initializations' into develop_integration_2018_w31

Merge remote-tracking branch 'origin/334-iq-replay-without-mmap-usage' into develop_integration_2018_w31

 * adding merge request allow flag:
  -- if false no forced merge to develop
  -- if true and if branch is not develop, then forced merge to develop
 * lowered the ru gains in CI conf files
 * adding on-the-fly HTML summary within python main.py script
 * adding 20 MHz testcases to FDD band 7 scenario
 * adding GitLab status for
  -- centOS build
  -- FDD-band7 tests
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

 -- if false no forced merge to develop
 -- if true and if branch is not develop, then forced merge to develop
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

  -- Adding script to notify developer when introducing compilation warnings
  -- Fix on the CentOS log archiving / reporting
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

- install package 'vim-common' to have 'xxd' needed by the compilation
  process of the T tracer
- change the way xxd is called so that no file is created in case
  of error

  Adding a build stage on CentOS (only one variant : -w USRP --eNB)
  Should not trigger a fail for the moment
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

  -- log collection on enb log requires a sudo when removing log files
  -- added iperf log collection to jenkins file
  -- corrected iperf detection of packet loss ( added jitter also)
  -- increased iperf DL requested BW for 10 MHz
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>