Change PHP to HTML
fix log in config
Merge branch 'master' into gh-pages