Merge pull request #83 from CodePath-MAF/liquid-assets-polish

Liquid assets polish
Merge remote-tracking branch 'origin/master' into liquid-assets-polish