Merge branch 'master' into timestep_order

examples/MultiTypes/makeIC.py

examples/MultiTypes/multiTypes.yml

examples/MultiTypes/run.sh

examples/main.c

examples/parameter_example.yml

src/Makefile.am

src/common_io.c

src/common_io.h

src/hydro/Default/hydro_io.h

src/hydro/Gadget2/hydro_io.h

src/hydro/Gizmo/hydro_io.h

src/hydro/Minimal/hydro_io.h

src/hydro/PressureEntropy/hydro_io.h

src/hydro_properties.c

src/io_properties.h

src/parallel_io.c

src/parser.c

src/part_type.c

src/part_type.h

src/runner.c