used test1 for index.jsp without servlet
Merge branch 'master' of https://github.com/judos/fisk.git