separate javascript and html

separate javascript and html
Merge branch 'dev'