Merged static files

I merged static files changes of commit "various bugs and changes--part2"