First attempt at solving minification problems
Fixed minification issues
Merge branch 'nocdn'