Merge branch 'master' into fix_pairs

.gitignore

README

configure.ac

doc/Doxyfile.in

examples/CoolingBox/energy_plot.py

examples/CoolingHalo/density_profile.py

examples/CoolingHalo/internal_energy_profile.py

examples/CoolingHalo/test_energy_conservation.py

examples/CoolingHalo/velocity_profile.py

examples/CoolingHaloWithSpin/density_profile.py

examples/CoolingHaloWithSpin/internal_energy_profile.py

examples/CoolingHaloWithSpin/test_energy_conservation.py

examples/CoolingHaloWithSpin/velocity_profile.py

examples/DiscPatch/HydroStatic/README

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

examples/DiscPatch/HydroStatic/disc-patch.yml

examples/DiscPatch/HydroStatic/dynamic.pro

examples/DiscPatch/HydroStatic/makeIC.py

examples/DiscPatch/HydroStatic/plotSolution.py

examples/DiscPatch/HydroStatic/run.sh