Merge branch 'master' into parallel_gpart_sort

examples/Makefile.am

examples/MultiTypes/makeIC.py

examples/main.c

src/Makefile.am

src/common_io.c

src/common_io.h

src/engine.c

src/gravity.h

src/gravity/Default/gravity_iact.h

src/gravity/Default/gravity_io.h

src/gravity/Default/gravity_part.h

src/hydro/Default/hydro_io.h

src/hydro/Gadget2/hydro_io.h

src/hydro/Minimal/hydro_io.h

src/parallel_io.c

src/parallel_io.h

src/partition.c

src/proxy.c

src/proxy.h

src/queue.c