everything works 2
remove useless fields
add jsp
Merge branch 'master' of https://github.com/opqpop/river