affilate update
Merge branch 'minification'