Fixed issue with scripts.js
Merge branch 'dev'