debugging leftover removed
Merge git://github.com/espressomd/espresso into shanchen
Reverted particle/fluid for backward compatibility