Merge branch 'master' into Parameter-File

.gitignore

doc/Doxyfile.in

examples/plot_tasks.py

examples/plot_tasks_MPI.py

src/Makefile.am

src/common_io.c

src/common_io.h

src/engine.c

src/gravity/Default/gravity.h

src/gravity/Default/gravity_iact.h

src/hydro/Default/hydro.h

src/hydro/Default/hydro_iact.h

src/hydro/Gadget2/hydro.h

src/hydro/Gadget2/hydro_iact.h

src/hydro/Minimal/hydro.h

src/hydro/Minimal/hydro_iact.h

src/kernel_gravity.c

src/kernel_gravity.h

src/kernel_hydro.c

src/kernel_hydro.h