removed temorary minified
Merge branch 'master' into staging