hashmap functional but slow
Merge remote-tracking branch 'origin/master'

Conflicts:
	FluidSim/FluidSim/fluidsimulator.cpp
	FluidSim/FluidSim/fluidsimulator.h
	FluidSim/FluidSim/main.cpp
	FluidSim/FluidSim/particle.h