Separated css and js from html
Merge branch 'dev'