Merge branch 'master' into PressureEntropy_SPH

.gitignore

AUTHORS

README

configure.ac

doc/Doxyfile.in

examples/BigCosmoVolume/makeIC.py

examples/CoolingBox/coolingBox.yml

examples/CoolingBox/energy_plot.py

examples/CoolingBox/makeIC.py

examples/CoolingBox/run.sh

examples/CosmoVolume/cosmoVolume.yml

examples/DiscPatch/GravityOnly/README

examples/DiscPatch/GravityOnly/disc-patch.yml

examples/DiscPatch/GravityOnly/makeIC.py

examples/DiscPatch/GravityOnly/run.sh

examples/DiscPatch/GravityOnly/test.pro

examples/DiscPatch/HydroStatic/README

examples/DiscPatch/HydroStatic/disc-patch-icc.yml

examples/DiscPatch/HydroStatic/disc-patch.yml

examples/DiscPatch/HydroStatic/dynamic.pro