Подправлен клас Fluid
Merge remote-tracking branch 'origin/refactoring' into dev
-