minor
incoorporate dmitry's changes into an older commit
Merge branch 'free_flight2'

Conflicts:
	src/fluid_time_step.f90
	src/flusi.f90
	src/geometry/hyd/kine.f90
	src/geometry/mask.f90
	src/geometry/mhd/mask_mhd.f90
	src/inicond/mhd/init_fields_mhd.f90
	src/integrals.f90
	src/postprocessing.f90
	src/save_fields.f90
	src/time_step.f90
	src/vars.f90