Minification working
Merge branch 'dev'