Merge pull request #174 from way2muchnoise/1.7-update

more fluid updates
fluid localization support