fluid/particle forces
fixed some stuff
Merge branch 'master' of https://github.com/MarkMGray/Fluids

Conflicts:
	moc_controller.cpp