Merge remote-tracking branch 'upstream/master' into fastsim

Conflicts:
	src/simulation/Simulation.cpp
	src/simulation/Simulation.h
Merge branch 'fastsim' of https://github.com/mmbob/The-Powder-Toy into fastsim