4.0.0 build.
Merge branch 'mc16'
Fix build.xml
SST Tracker should use total time

Closed #1107
Fix AWB dupe

And make it less likely to happen again in the future.

Also cleaned up some fluid stuff.
Merge branch 'master' into builder