deleted index.html
Addedd all files from server download
New files
Merge branch 'dev'