Trying with no jquery loading
Merge branch 'setup'