Correct gradle build to replace in scala Reference file.
Fix crash on invalid fluid definitions in groups.
Merge remote-tracking branch 'origin/master'