Optimize Modernizr and JS loading
Merge pull request #1445 from Alex-D/optim-modernizr

Optimize Modernizr and JS loading