new object-in-fluid functionality
Merge branch 'master' of git://github.com/espressomd/espresso

Conflicts:
	scripts/object_in_fluid.tcl