Deferred loading of javascript
Merge branch 'deferjscorrectly'