ignore minified
Merge branch 'dev'