Conflicts:
	src/ARCH_SRC/CPL_WAVE/MNH/ground_paramn.f90
	src/ARCH_SRC/CPL_WAVE/MNH/ini_modeln.f90
	src/MNH/default_desfmn.f90
	src/MNH/goto_model_wrapper.f90
	src/MNH/ground_paramn.f90
	src/MNH/ini_lb.f90
	src/MNH/ini_modeln.f90
	src/MNH/modeln.f90
	src/MNH/read_exsegn.f90
	src/MNH/read_field.f90
	src/MNH/write_aircraft_balloon.f90
	src/SURFEX/ch_init_depconst.F90
	src/SURFEX/ch_init_emissionn.F90
	src/SURFEX/ch_init_snapn.F90
	src/SURFEX/init_surf_atmn.F90
	src/SURFEX/writesurf_snapn.F90

C.Lac 15/11/2016 Add droplet deposition + Improvement of EDKF and adaptation to the grey zone + Add droplet deposition

Gaelle Tanguy authored 8 years ago and WAUTELET Philippe committed 8 years ago

C.LAC 26/04/2016 : negative contribution to the budget splitted between advection, turbulence and microphysics for KHKO/C2R2