Conflicts:
	common/utils/LOG/log.c
	targets/RT/USER/lte-softmodem.c
	targets/RT/USER/lte-uesoftmodem.c

Merge branch '373-parallelization-not-working-correctly-in-phy-simulators-and-bad-implementation-2' into L1_renaming

  -- RAW record file is parsed and replayed
  -- Replayed log file is parsed instead of normal eNB file during terminate
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

Develop integration 2018 week 47

See merge request oai/openairinterface5g!456

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

  -- tracing is done w/ a single UE attach / detach
  -- traffic b/ EPC and eNB is captured by tshark
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

Merge remote-tracking branch 'origin/issue362_getoptions_errorhandling' into develop_integration_2018_w47

  -- Works for a Skywire 4G LTE CAT M1 device
     Single-module environment
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

Develop integration 2018 w46

See merge request oai/openairinterface5g!445

Merge remote-tracking branch 'origin/bladerf-support-fix-2018-w45' into develop_integration_2018_w46

A new option -live has been added to run live (ie. like the 'enb' tracer)
and options -live-ip and -live-port to select IP/port of the machine running
the eNodeB.

Some new options to control MIB and SIBs recording have been added.

Some global variables have been removed.

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

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