fix www-problem
fix index-bug
Merge branch 'master' into db