add custom js
add xss test
Merge branch 'dev'