Rolling back sphdata to live inside Sph.h; removed separated particle types
Changed implementation of GetParticleIPointer inside the sph class
Fixed memory allocation/deallocation routines and ReorderParticles in Sph.cpp to update also sphintdata
Merge branch 'mpi' of github.com:gandalfcode/gandalf into mpi

Conflicts:
	src/SphParticle.h