merge foireux
merge foireux

frodrigo/navitia,lrocheWB/navitia,pbougue/navitia,kinnou02/navitia,VincentCATILLON/navitia,kinnou02/navitia,antoine-de/navitia,kadhikari/navitia,TeXitoi/navitia,djludo/navitia,fueghan/navitia,xlqian/navitia,prhod/navitia,pbougue/navitia,xlqian/navitia,francois-vincent/navitia,pbougue/navitia,djludo/navitia,patochectp/navitia,kadhikari/navitia,TeXitoi/navitia,datanel/navitia,prhod/navitia,stifoon/navitia,Tisseo/navitia,djludo/navitia,pbougue/navitia,ballouche/navitia,lrocheWB/navitia,lrocheWB/navitia,thiphariel/navitia,VincentCATILLON/navitia,frodrigo/navitia,TeXitoi/navitia,xlqian/navitia,datanel/navitia,CanalTP/navitia,kadhikari/navitia,kinnou02/navitia,fueghan/navitia,datanel/navitia,kadhikari/navitia,francois-vincent/navitia,VincentCATILLON/navitia,thiphariel/navitia,ballouche/navitia,xlqian/navitia,ballouche/navitia,Tisseo/navitia,CanalTP/navitia,Tisseo/navitia,thiphariel/navitia,VincentCATILLON/navitia,stifoon/navitia,francois-vincent/navitia,fueghan/navitia,Tisseo/navitia,is06/navitia,stifoon/navitia,antoine-de/navitia,prhod/navitia,fueghan/navitia,datanel/navitia,is06/navitia,ballouche/navitia,Tisseo/navitia,patochectp/navitia,patochectp/navitia,francois-vincent/navitia,is06/navitia,antoine-de/navitia,CanalTP/navitia,CanalTP/navitia,xlqian/navitia,antoine-de/navitia,djludo/navitia,frodrigo/navitia,lrocheWB/navitia,CanalTP/navitia,stifoon/navitia,TeXitoi/navitia,patochectp/navitia,thiphariel/navitia,frodrigo/navitia,kinnou02/navitia,prhod/navitia,is06/navitia