uglify image
Merge branch 'dev'