fixed index.html
Merge branch 'soulmatt'
fixed logout
Merge branch 'soulmatt'