updated files for static site
fixed unicorn conf
fixed index.html
Merge branch 'master' into version2