Cache busted scripts.js
Merge branch 'dev' into beta