fix the paths to css and js
css path fix
Merge branch 'develop'