deleted unusable js and css files
Merge branch 'dev'