Uglify back on
Merge branch 'master' of github.com:Zolmeister/yummy-cupcake
Merge branch 'master' of github.com:Zolmeister/yummy-cupcake