urgent fix for index,html
Merge branch 'master' of https://github.com/piotrw/test into linux-team
linux-done