Merge remote-tracking branch 'origin/basic-simulator' into develop_integration_2018_w19

Conflicts:
	openair1/PHY/LTE_TRANSPORT/prach.c
	targets/RT/USER/lte-ue.c

openair1/PHY/LTE_ESTIMATION/lte_adjust_sync.c

@@ -85,6 +85,11 @@ void lte_adjust_synch(LTE_DL_FRAME_PARMS *frame_parms,
   {
       diff = max_pos_fil - (frame_parms->nb_prefix_samples>>3);
 
+#if BASIC_SIMULATOR
+      /* a hack without which the UE does not connect (to be fixed somehow) */
+      diff = 0;
+#endif
+
       if ( abs(diff) < SYNCH_HYST )
           ue->rx_offset = 0;
       else